Remove some unused code

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

diff --git a/src/ui/gui/psppire-import-assistant.c b/src/ui/gui/psppire-import-assistant.c
index 144ea285c3c536a14552b3f764e154f1176a3ec3..9bdac0009f6d76c900e17d8b0d0694aecb190875 100644 (file)
--- a/src/ui/gui/psppire-import-assistant.c
+++ b/src/ui/gui/psppire-import-assistant.c
@@ -14,7 +14,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-
 #include <config.h>
 
 #include <errno.h>
@@ -133,8 +132,6 @@ psppire_import_assistant_get_property (GObject    *object,
 static GObjectClass * parent_class = NULL;
 
 
-static void destroy_columns (PsppireImportAssistant *ia);
-
 static void
 psppire_import_assistant_finalize (GObject *object)
 {
@@ -144,8 +141,6 @@ psppire_import_assistant_finalize (GObject *object)
   if (ia->spreadsheet)
     spreadsheet_unref (ia->spreadsheet);
 
-  //  destroy_columns (ia);
-
   ds_destroy (&ia->separators);
   ds_destroy (&ia->quotes);
 
@@ -733,9 +728,9 @@ on_chosen (PsppireImportAssistant *ia, GtkWidget *page)
 static void
 on_map (PsppireImportAssistant *ia, GtkWidget *page)
 {
+#if TEXT_FILE
   GtkFileChooser *fc = GTK_FILE_CHOOSER (page);
 
-#if TEXT_FILE
   if (ia->file_name)
     gtk_file_chooser_set_filename (fc, ia->file_name);
 #endif
@@ -987,7 +982,6 @@ on_treeview_selection_change (PsppireImportAssistant *ia)
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
     {
       int n;
-      PsppireTextFile *tf = PSPPIRE_TEXT_FILE (model);
       GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
       gint *index = gtk_tree_path_get_indices (path);
 
@@ -1232,21 +1226,6 @@ struct column
 
 #if SHEET_MERGE
 
-static void
-destroy_columns (PsppireImportAssistant *ia)
-{
-  struct column *col;
-  for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
-    {
-      free (col->name);
-      free (col->contents);
-    }
-
-  free (ia->columns);
-}
-
-
-
 /* Called to render one of the cells in the fields preview tree
    view. */
 static void
@@ -1298,7 +1277,7 @@ parse_field (PsppireImportAssistant *ia,
   bool ok;
 
   struct substring field = ia->columns[column].contents[row];
-  struct variable *var = dict_get_var (ia->dict, column);
+  const struct variable *var = dict_get_var (ia->dict, column);
   union value val;
 
   value_init (&val, var_get_width (var));
@@ -1849,8 +1828,7 @@ my_read (struct casereader *reader, void *aux, casenumber idx)
 static void
 my_destroy (struct casereader *reader, void *aux)
 {
-  PsppireImportAssistant *ia = PSPPIRE_IMPORT_ASSISTANT (aux);
-  g_print ("%s:%d\n", __FILE__, __LINE__);
+  g_print ("%s:%d %p\n", __FILE__, __LINE__, reader);
 }
 
 static void
@@ -1883,9 +1861,9 @@ foo (struct dictionary *dict, void *aux)
 
 
   PsppireDataStore *store = NULL;
-    
+
   g_object_get (ia->data_sheet, "data-model", &store, NULL);
-  
+
   psppire_data_store_set_reader (store, reader);
 }
 
@@ -1902,18 +1880,53 @@ prepare_formats_page (PsppireImportAssistant *ia)
   my_casereader_class.advance = my_advance;
 
   struct caseproto *proto = caseproto_create ();
-
-  dict_set_change_callback (ia->dict, foo, ia);
-
   int i;
+
+  struct fmt_guesser **fg = xcalloc (sizeof *fg, dict_get_var_cnt (ia->dict));
   for (i = 0 ; i < dict_get_var_cnt (ia->dict); ++i)
     {
-      const struct variable *var = dict_get_var (ia->dict, i);
-      proto = caseproto_add_width (proto, var_get_width (var));
+      fg[i] = fmt_guesser_create ();
     }
 
   gint n_rows = gtk_tree_model_iter_n_children (ia->delimiters_model, NULL);
 
+  GtkTreeIter iter;
+  gboolean ok;
+  for (ok = gtk_tree_model_get_iter_first (ia->delimiters_model, &iter);
+       ok;
+       ok = gtk_tree_model_iter_next (ia->delimiters_model, &iter))
+    {
+      for (i = 0 ; i < dict_get_var_cnt (ia->dict); ++i)
+       {
+         gchar *s = NULL;
+         gtk_tree_model_get (ia->delimiters_model, &iter, i+1, &s, -1);
+         fmt_guesser_add (fg[i], ss_cstr (s));
+         free (s);
+       }
+    }
+
+  for (i = 0 ; i < dict_get_var_cnt (ia->dict); ++i)
+    {
+      struct fmt_spec fs;
+      fmt_guesser_guess (fg[i], &fs);
+
+      fmt_fix (&fs, FMT_FOR_INPUT);
+
+      struct variable *var = dict_get_var (ia->dict, i);
+
+      int width = fmt_var_width (&fs);
+
+      var_set_width_and_formats (var, width,
+                                &fs, &fs);
+
+      proto = caseproto_add_width (proto, width);
+      fmt_guesser_destroy (fg[i]);
+    }
+
+  free (fg);
+
+  //  dict_set_change_callback (ia->dict, foo, ia);
+
   struct casereader *reader =
     casereader_create_random (proto, n_rows, &my_casereader_class,  ia);
 
@@ -1922,6 +1935,15 @@ prepare_formats_page (PsppireImportAssistant *ia)
 
   g_object_set (ia->data_sheet, "data-model", store, NULL);
 
+
+  gint pmax;
+  g_object_get (get_widget_assert (ia->builder, "vpaned1"),
+               "max-position", &pmax, NULL);
+
+
+  g_object_set (get_widget_assert (ia->builder, "vpaned1"),
+               "position", pmax / 2, NULL);
+
   gtk_widget_show (ia->paste_button);
 }
 
@@ -1958,7 +1980,6 @@ formats_page_create (PsppireImportAssistant *ia)
   add_page_to_assistant (ia, w,
                         GTK_ASSISTANT_PAGE_CONFIRM, _("Adjust Variable Formats"));
 
-  ia->data_tree_view = NULL;
   ia->modified_vars = NULL;
   ia->modified_var_cnt = 0;
 }