Basic working spreadsheet import dialog (sort of)

[pspp] / src / ui / gui / page-formats.c

diff --git a/src/ui/gui/page-formats.c b/src/ui/gui/page-formats.c
index ee9b540bdc703d1c07bcb116ca3bebec6b0e7127..c79551fb04415071ffabd26455ea183d3f0c17c9 100644 (file)
--- a/src/ui/gui/page-formats.c
+++ b/src/ui/gui/page-formats.c
@@ -104,7 +104,7 @@ prepare_formats_page (struct import_assistant *ia)
   GtkBin *vars_scroller;
   GtkWidget *old_var_sheet;
   PsppireVarSheet *var_sheet;
-  struct separators_page *s = &ia->separators;
+  struct separators_page *seps = &ia->separators;
   struct formats_page *p = &ia->formats;
   struct fmt_guesser *fg;
   unsigned long int number = 0;
@@ -114,7 +114,8 @@ prepare_formats_page (struct import_assistant *ia)
 
   dict = dict_create (get_default_encoding ());
   fg = fmt_guesser_create ();
-  for (column_idx = 0; column_idx < s->column_cnt; column_idx++)
+  printf ("%s:%d Column count %d\n", __FILE__, __LINE__, seps->column_cnt);
+  for (column_idx = 0; column_idx < seps->column_cnt; column_idx++)
     {
       struct variable *modified_var;
 
@@ -122,7 +123,7 @@ prepare_formats_page (struct import_assistant *ia)
                       ? p->modified_vars[column_idx] : NULL);
       if (modified_var == NULL)
         {
-          struct column *column = &s->columns[column_idx];
+          struct column *column = &seps->columns[column_idx];
           struct variable *var;
           struct fmt_spec format;
           char *name;