Merge remote branch 'origin/master' into import-gui

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

diff --git a/src/ui/gui/page-file.c b/src/ui/gui/page-file.c
index d8939149c437e394873d4679fc8229ae45aa4dae..84b7928a27645689afc37a04a6268edbb1de33ff 100644 (file)
--- a/src/ui/gui/page-file.c
+++ b/src/ui/gui/page-file.c
@@ -66,63 +66,8 @@ struct import_assistant;
 
 /* Choose a file */
 static char *choose_file (GtkWindow *parent_window, gchar **encodingp);
-enum { MAX_PREVIEW_LINES = 1000 }; /* Max number of lines to read. */
 
 
-/*
-  Update IA according to the contents of DICT and CREADER.
-  CREADER will be destroyed by this function.
-*/
-void 
-update_assistant (struct import_assistant *ia)
-{
-  struct sheet_spec_page *ssp = ia->sheet_spec;
-
-  struct file *file = &ia->file;
-  struct separators_page *sepp = ia->separators;
-  int rows = 0;
-  if (ssp->dict)
-    {
-      struct ccase *c;
-      int col;
-
-
-      sepp->column_cnt = dict_get_var_cnt (ssp->dict);
-      sepp->columns = xcalloc (sepp->column_cnt, sizeof (*sepp->columns));
-      for (col = 0; col < sepp->column_cnt ; ++col)
-       {
-         const struct variable *var = dict_get_var (ssp->dict, col);
-         sepp->columns[col].name = xstrdup (var_get_name (var));
-         sepp->columns[col].contents = NULL;
-       }
-
-      for (; (c = casereader_read (ssp->reader)) != NULL; case_unref (c))
-       {
-         rows++;
-         for (col = 0; col < sepp->column_cnt ; ++col)
-           {
-             char *ss;
-             const struct variable *var = dict_get_var (ssp->dict, col);
-
-             sepp->columns[col].contents = xrealloc (sepp->columns[col].contents,
-                                                     sizeof (struct substring) * rows);
-
-             ss = data_out (case_data (c, var), dict_get_encoding (ssp->dict), 
-                            var_get_print_format (var));
-
-             sepp->columns[col].contents[rows - 1] = ss_cstr (ss);
-           }
-
-         if (rows > MAX_PREVIEW_LINES)
-           {
-             case_unref (c);
-             break;
-           }
-       }
-    }
-  
-  file->line_cnt = rows;
-}
 
 
 /* Obtains the file to import from the user and initializes IA's
@@ -136,35 +81,19 @@ init_file (struct import_assistant *ia, GtkWindow *parent_window)
 {
   enum { MAX_LINE_LEN = 16384 }; /* Max length of an acceptable line. */
   struct file *file = &ia->file;
-  struct sheet_spec_page *ssp = ia->sheet_spec;
-  struct spreadsheet_read_info sri;
-  struct spreadsheet_read_options opts;
 
   file->lines = NULL;
   file->file_name = choose_file (parent_window, &file->encoding);
   if (file->file_name == NULL)
     return false;
 
-  opts.sheet_name = NULL;
-  opts.cell_range = NULL;
-  opts.sheet_index = 1;
-
-  sri.file_name = file->file_name;
-  sri.read_names = true;
-  sri.asw = -1;
+  if (ia->spreadsheet == NULL)
+    ia->spreadsheet = gnumeric_probe (file->file_name, false);
 
-  if (ssp->spreadsheet == NULL)
-    ssp->spreadsheet = gnumeric_probe (sri.file_name);
-  
-  if (ssp->spreadsheet == NULL)
-    ssp->spreadsheet = ods_probe (sri.file_name);
+  if (ia->spreadsheet == NULL)
+    ia->spreadsheet = ods_probe (file->file_name, false);
 
-  if (ssp->spreadsheet)
-    {
-      
-      //      update_assistant (ia);
-    }
-  else
+  if (ia->spreadsheet == NULL)
     {
     struct string input;
     struct line_reader *reader = line_reader_for_file (file->encoding, file->file_name, O_RDONLY);
@@ -307,7 +236,7 @@ choose_file (GtkWindow *parent_window, gchar **encodingp)
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("OpenOffice.Org Spreadsheet Files"));
+  gtk_file_filter_set_name (filter, _("OpenDocument Spreadsheet Files"));
   gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
@@ -317,7 +246,6 @@ choose_file (GtkWindow *parent_window, gchar **encodingp)
   gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
-
   gtk_file_chooser_set_extra_widget (
     GTK_FILE_CHOOSER (dialog), psppire_encoding_selector_new ("Auto", true));