Make opts const

and remove the feature where it was filled in by the reader

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index 201ef599a16f7466fd589caa6340b75b46c97a4a..5e4b6978ef55ebc7c3239b438f8d564b1816ac05 100644 (file)
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -208,10 +208,9 @@ process_node (struct gnumeric_reader *r)
   if (name == NULL)
     name = xmlStrdup (_xml ("--"));
 
-
   r->node_type = xmlTextReaderNodeType (r->xtr);
 
-  switch ( r->state)
+  switch (r->state)
     {
     case STATE_PRE_INIT:
       r->current_sheet = -1;
@@ -531,7 +530,7 @@ gnumeric_probe (const char *filename, bool report_errors)
 struct casereader *
 gnumeric_make_reader (struct spreadsheet *spreadsheet,
                      const struct spreadsheet_read_info *gri, 
-                     struct spreadsheet_read_options *opts)
+                     const struct spreadsheet_read_options *opts)
 {
   struct gnumeric_reader *r = NULL;
   unsigned long int vstart = 0;
@@ -727,7 +726,8 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet,
 
   free (var_spec);
   
-  
+
+#if 0  
   if (opts->cell_range == NULL)
     {
       opts->cell_range = c_xasprintf ("%c%d:%c%ld", 
@@ -736,6 +736,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet,
                                       r->stop_col + 'A' + caseproto_get_n_widths (r->proto),
                                       r->start_row + n_cases);
     }
+#endif
   
   return casereader_create_sequential
     (NULL,

diff --git a/src/data/gnumeric-reader.h b/src/data/gnumeric-reader.h
index a2aaabf7bce612b65b852d62ffd418963a82a635..f4c7c38d2240044fd29c3214bfa77bd48b35f2ae 100644 (file)
--- a/src/data/gnumeric-reader.h
+++ b/src/data/gnumeric-reader.h
@@ -34,7 +34,7 @@ void gnumeric_destroy (struct spreadsheet *);
 
 struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet,
                                          const struct spreadsheet_read_info *gri, 
-                                         struct spreadsheet_read_options *opts);
+                                         const struct spreadsheet_read_options *opts);
 
 
 #endif

diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index dd19898c539ce569271600056ddba5db6058c985..fc23c2dbaf0cfa34a06f5190a312b4ab7942fc45 100644 (file)
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -419,7 +419,8 @@ struct spreadsheet *ods_probe (const char *filename, bool report_errors)
 
 struct casereader *
 ods_make_reader (struct spreadsheet *spreadsheet, 
-                const struct spreadsheet_read_info *gri, struct spreadsheet_read_options *opts)
+                const struct spreadsheet_read_info *gri,
+                const struct spreadsheet_read_options *opts)
 {
   intf ret = 0;
   xmlChar *type = NULL;

diff --git a/src/data/ods-reader.h b/src/data/ods-reader.h
index f068aa39d7b2eae68e73ac671213ccc5f5111074..c602963094538691dad73af233a9121b0f318667 100644 (file)
--- a/src/data/ods-reader.h
+++ b/src/data/ods-reader.h
@@ -27,7 +27,7 @@ struct spreadsheet *ods_probe (const char *filename, bool report_errors);
 
 struct casereader * ods_make_reader (struct spreadsheet *spreadsheet, 
                                     const struct spreadsheet_read_info *gri,
-                                    struct spreadsheet_read_options *opts);
+                                    const struct spreadsheet_read_options *opts);
 
 
 #endif

diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h
index f6380e31c1af537e9273f21b5f590e056eecf5ec..d5d9a5f4c1bf9997267106383c8e347e0746cd46 100644 (file)
--- a/src/data/spreadsheet-reader.h
+++ b/src/data/spreadsheet-reader.h
@@ -28,12 +28,11 @@
 */
 struct spreadsheet_read_options
 {
-  char *sheet_name ;       /* The name of the sheet to open (in UTF-8) */
+  const char *sheet_name ; /* The name of the sheet to open (in UTF-8) */
   int sheet_index ;        /* The index of the sheet to open (only used if sheet_name is NULL) */
-  char *cell_range ;       /* The cell range (in UTF-8) */
+  const char *cell_range ; /* The cell range (in UTF-8) */
 };
 
-
 struct spreadsheet_read_info
 {
   bool read_names ;        /* True if the first row is to be used as the names of the variables */

diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index f12261a10f117db4328d105b428296ab1db01a83..09251a69c43a1fae212da769e7198d94814fce2d 100644 (file)
--- a/src/language/data-io/get-data.c
+++ b/src/language/data-io/get-data.c
@@ -672,8 +672,6 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
 
 static void 
 destroy_spreadsheet_read_info (UNUSED struct spreadsheet_read_info *sri,
-                              struct spreadsheet_read_options *opts)
+                              UNUSED struct spreadsheet_read_options *opts)
 {
-  free (opts->sheet_name);
-  free (opts->cell_range);
 }

diff --git a/src/ui/gui/page-sheet-spec.c b/src/ui/gui/page-sheet-spec.c
index b29472761c0e8bd64e3f4fcdab8a59487fb3332b..9aa16b592544e8e1ed34f7a27ad5a45cb7390926 100644 (file)
--- a/src/ui/gui/page-sheet-spec.c
+++ b/src/ui/gui/page-sheet-spec.c
@@ -87,6 +87,9 @@ char *
 sheet_spec_gen_syntax (const struct import_assistant *ia)
 {
   const struct sheet_spec_page *ssp = ia->sheet_spec;
+  GtkBuilder *builder = ia->asst.builder;
+  GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
+  const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry));
 
   struct string s = DS_EMPTY_INITIALIZER;
 
@@ -102,11 +105,10 @@ sheet_spec_gen_syntax (const struct import_assistant *ia)
                   ssp->sri.read_names ? "ON" : "OFF");
 
 
-  if ( ssp->opts.cell_range)
+  if (range && 0 != strcmp ("", range))
     {
       syntax_gen_pspp (&s,
-                      "\n  /CELLRANGE=RANGE %sq",
-                      ssp->opts.cell_range);
+                      "\n  /CELLRANGE=RANGE %sq", range);
     }
   else
     {
@@ -197,9 +199,8 @@ post_sheet_spec_page (struct import_assistant *ia)
   struct casereader *creader = NULL;
   struct dictionary *dict = NULL;
 
-  GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
   GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
-
+  GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
   const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry));
   GtkWidget *combo_box = get_widget_assert (builder, "sheet-entry");