Use convert cell range instead of doing it ourselves

[pspp] / src / ui / gui / page-sheet-spec.c

diff --git a/src/ui/gui/page-sheet-spec.c b/src/ui/gui/page-sheet-spec.c
index 4905a78494f8261348229f71634d057c9079ff35..1c72e830e0e1ab7c51cc8715ab7ba9ef5630d423 100644 (file)
--- a/src/ui/gui/page-sheet-spec.c
+++ b/src/ui/gui/page-sheet-spec.c
@@ -30,6 +30,9 @@
 #include "data/data-out.h"
 #include "data/format-guesser.h"
 #include "data/value-labels.h"
+#include "data/gnumeric-reader.h"
+#include "data/ods-reader.h"
+#include "data/spreadsheet-reader.h"
 #include "language/data-io/data-parser.h"
 #include "language/lexer/lexer.h"
 #include "libpspp/assertion.h"
@@ -81,5 +84,82 @@ init_sheet_spec_page (struct import_assistant *ia)
 void
 reset_sheet_spec_page (struct import_assistant *ia)
 {
+  printf ("%s\n", __FUNCTION__);
+}
+
+/* Called when the Forward button is clicked, 
+   but before displaying the new page.
+*/
+void
+post_sheet_spec_page (struct import_assistant *ia)
+{
+  int row_start = -1;
+  int row_stop = -1;
+  int col_start = -1;
+  int col_stop = -1;
+
+  GtkBuilder *builder = ia->asst.builder;
+
+  struct file *file = &ia->file;
+  struct sheet_spec_page *ssp = &ia->sheet_spec;
+  struct casereader *creader = NULL;
+  struct dictionary *dict = NULL;
+
+  GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry");
+  GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
+  GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
+
+  gint num = atoi (gtk_entry_get_text (GTK_ENTRY (sheet_entry)));
+
+  const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry));
+
+
+  if ( num < 1 )
+    num = 1;
+  
+  ssp->opts.sheet_name = NULL;
+  ssp->opts.cell_range = range;
+  ssp->opts.sheet_index = num;
+
+  if ( convert_cell_ref (range, &col_start, &row_start, &col_stop, &row_stop))
+    {
+      ssp->opts.cell_range = range;
+    }
+
+  ssp->sri.file_name = file->file_name;
+  ssp->sri.read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (readnames_checkbox));
+  ssp->sri.asw = -1;
+
+  switch (ia->file.type)
+    {
+    case FTYPE_ODS:
+      creader = ods_open_reader (&ssp->sri, &ssp->opts, &dict);
+      break;
+    case FTYPE_GNUMERIC:
+      creader = gnumeric_open_reader (&ssp->sri, &ssp->opts, &dict);
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
+    }
+
+  ssp->dict = dict;
+  ssp->reader = creader;
+
+  if (creader && dict)
+    {
+      update_assistant (ia);
+    }
+  else
+    {
+      GtkWidget * dialog = gtk_message_dialog_new (NULL,
+                             GTK_DIALOG_MODAL,
+                             GTK_MESSAGE_ERROR,
+                             GTK_BUTTONS_CLOSE,
+                             _("An error occurred reading the spreadsheet file."));
+
+      gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
+    }
 }