Use convert cell range instead of doing it ourselves

[pspp] / src / ui / gui / text-data-import-dialog.c

diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c
index cda83ebb65caedf2e60f7b6aa7ac05411ca478a8..df6e5ec995161be6708222bf31ad45b9383d8410 100644 (file)
--- a/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@ -80,8 +80,6 @@ text_data_import_assistant (PsppireDataWindow *dw)
       return;
     }
 
-  printf ("%s:%d %s\n", __FILE__, __LINE__, ia->file.file_name);
-
   init_assistant (ia, parent_window);
   if ( ia->file.type == FTYPE_TEXT)
     {
@@ -289,12 +287,28 @@ generate_syntax (const struct import_assistant *ia)
                         "\n  /TYPE=%ss"
                         "\n  /FILE=%sq"
                         "\n  /SHEET=index %d"
-                        "\n  /READNAMES=%ss"
-                        ".",
+                        "\n  /READNAMES=%ss",
                         (ia->file.type == FTYPE_GNUMERIC) ? "GNM" : "ODS",
                         ia->file.file_name,                     
                         ssp->opts.sheet_index,
                         ssp->sri.read_names ? "ON" : "OFF");
+
+
+       if ( ssp->opts.cell_range)
+         {
+           syntax_gen_pspp (&s,
+                            "\n  /CELLRANGE=RANGE %sq",
+                            ssp->opts.cell_range);
+         }
+       else
+         {
+           syntax_gen_pspp (&s,
+                            "\n  /CELLRANGE=FULL");
+         }
+
+
+       syntax_gen_pspp (&s, ".");
+
       }
       break;