Import Assistant: Fix generation of /DELIMITERS subcommand

[pspp] / src / ui / gui / psppire-import-assistant.h

diff --git a/src/ui/gui/psppire-import-assistant.h b/src/ui/gui/psppire-import-assistant.h
index dc52c7aeb66cd09ca6ee656b1fc4a79564d4a498..60a771dbc4cf933cfc0e10fbecb461b7a28d15e9 100644 (file)
--- a/src/ui/gui/psppire-import-assistant.h
+++ b/src/ui/gui/psppire-import-assistant.h
@@ -69,12 +69,14 @@ struct _PsppireImportAssistant
 
   gint current_page;
 
+  gchar *file_name;
+
   /* START The chooser page of the assistant. */
   GtkWidget *encoding_selector;
   GtkFileFilter *default_filter;
   /* END The chooser page of the assistant. */
 
-  
+
   /* START The introduction page of the assistant. */
     GtkWidget *all_cases_button;
     GtkWidget *n_cases_button;
@@ -87,13 +89,14 @@ struct _PsppireImportAssistant
 /* START Page where the user chooses field separators. */
 
   /* How to break lines into columns. */
-  struct string separators;   /* Field separators. */
+  //  struct string separators;   /* Field separators. */
   struct string quotes;       /* Quote characters. */
 
   GtkWidget *custom_cb;
   GtkWidget *custom_entry;
   GtkWidget *quote_cb;
   GtkWidget *quote_combo;
+
   GtkEntry *quote_entry;
   GtkWidget *fields_tree_view;
 
@@ -101,10 +104,8 @@ struct _PsppireImportAssistant
 
 
 /* START Page where the user verifies and adjusts input formats. */
-  GtkWidget *data_tree_view;
-  PsppireDict *psppire_dict;
-  struct variable **modified_vars;
-  size_t modified_var_cnt;
+   struct variable **modified_vars;
+   size_t modified_var_cnt;
 /* END Page where the user verifies and adjusts input formats. */
 
 
@@ -125,17 +126,23 @@ struct _PsppireImportAssistant
   PsppireTextFile *text_file;
 
   GtkTreeModel *delimiters_model;
-  
+
   struct sheet_spec_page *sheet_spec;
 
+#if MERGE_SHEET
   /* The columns produced. */
   struct column *columns;     /* Information about each column. */
   size_t column_cnt;          /* Number of columns. */
 
   int skip_lines;             /* Number of initial lines to skip? */
   gboolean variable_names;        /* Variable names above first line of data? */
+#endif
+
   struct dictionary *dict;
 
+  GtkWidget *var_sheet;
+  GtkWidget *data_sheet;
+
   struct spreadsheet *spreadsheet;
 };