X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-file.c;h=fdbda325f8ffdc0771cfb647a108a6124865874d;hb=19cf39ef8802208ca67fc3e1cf12ce4b239aaabf;hp=ccdf37dcdf796e3edb1cd848c24d6b3411646cf4;hpb=4785da39b9cb392c0a6a2c38a8abac199a72d615;p=pspp

diff --git a/src/ui/gui/page-file.c b/src/ui/gui/page-file.c
index ccdf37dcdf..fdbda325f8 100644
--- a/src/ui/gui/page-file.c
+++ b/src/ui/gui/page-file.c
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
 #include <gtk/gtk.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -50,7 +49,6 @@
 #include "ui/gui/psppire-encoding-selector.h"
 #include "ui/gui/psppire-empty-list-store.h"
 #include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-var-store.h"
 #include "ui/gui/psppire-scanf.h"
 #include "ui/syntax-gen.h"
 
@@ -64,10 +62,12 @@
 
 struct import_assistant;
 
-/* Choosing a file and reading it. */
-
+/* Choose a file */
 static char *choose_file (GtkWindow *parent_window, gchar **encodingp);
 
+
+
+
 /* Obtains the file to import from the user and initializes IA's
    file substructure.  PARENT_WINDOW must be the window to use
    as the file chooser window's parent.
@@ -77,83 +77,21 @@ static char *choose_file (GtkWindow *parent_window, gchar **encodingp);
 bool
 init_file (struct import_assistant *ia, GtkWindow *parent_window)
 {
-  enum { MAX_PREVIEW_LINES = 1000 }; /* Max number of lines to read. */
   enum { MAX_LINE_LEN = 16384 }; /* Max length of an acceptable line. */
   struct file *file = &ia->file;
-  struct separators_page *sepp = &ia->separators;
-  struct casereader *creader = NULL;
-  struct dictionary *dict = NULL;
-  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;
+  if (ia->spreadsheet == NULL)
+    ia->spreadsheet = gnumeric_probe (file->file_name, false);
 
-  sri.file_name = file->file_name;
-  sri.read_names = true;
-  sri.asw = -1;
+  if (ia->spreadsheet == NULL)
+    ia->spreadsheet = ods_probe (file->file_name, false);
 
-  if (!creader) 
-    {
-      creader = gnumeric_open_reader (&sri, &opts, &dict);
-      ia->file.type = FTYPE_GNUMERIC;
-    }
-	
-  if (!creader) 
-    {
-      creader = ods_open_reader (&sri, &opts, &dict);
-      ia->file.type = FTYPE_ODS;
-    }
-    
-  if (creader)
-    {
-      int col;
-      int rows = 0;
-      struct ccase *c;
-  
-      sepp->column_cnt = dict_get_var_cnt (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 (dict, col);
-	  sepp->columns[col].name = xstrdup (var_get_name (var));
-	  sepp->columns[col].contents = NULL;
-	}
-
-      for (; (c = casereader_read (creader)) != NULL; case_unref (c))
-	{
-	  rows++;
-	  for (col = 0; col < sepp->column_cnt ; ++col)
-	    {
-	      char *ss;
-	      const struct variable *var = dict_get_var (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 (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;
-      casereader_destroy (creader);
-    }
-  else
+  if (ia->spreadsheet == NULL)
     {
     struct string input;
     struct line_reader *reader = line_reader_for_file (file->encoding, file->file_name, O_RDONLY);
@@ -216,7 +154,6 @@ init_file (struct import_assistant *ia, GtkWindow *parent_window)
       }
 
     line_reader_close (reader);
-    ia->file.type = FTYPE_TEXT;
   }
 
   return true;
@@ -264,7 +201,7 @@ choose_file (GtkWindow *parent_window, gchar **encodingp)
   g_object_set (dialog, "local-only", FALSE, NULL);
 
   filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Text files"));
+  gtk_file_filter_set_name (filter, _("Text Files"));
   gtk_file_filter_add_mime_type (filter, "text/*");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
@@ -297,7 +234,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);
 
@@ -307,7 +244,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));