X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-file.c;h=bf09902bf9e68c19cf3894f3d37ff504334a6a98;hb=03a7b96a587a58bda342b4eb5ce5f935880ba2b7;hp=9ac69e86856db98fe049a4824a1e76377b99086b;hpb=5c210c96542db2a357cf1aa6b690ef2ea88a54b1;p=pspp diff --git a/src/ui/gui/page-file.c b/src/ui/gui/page-file.c index 9ac69e8685..bf09902bf9 100644 --- a/src/ui/gui/page-file.c +++ b/src/ui/gui/page-file.c @@ -20,7 +20,6 @@ #include #include -#include #include #include #include @@ -40,7 +39,6 @@ #include "libpspp/i18n.h" #include "libpspp/line-reader.h" #include "libpspp/message.h" -#include "ui/gui/checkbox-treeview.h" #include "ui/gui/dialog-common.h" #include "ui/gui/executor.h" #include "ui/gui/helper.h" @@ -50,11 +48,9 @@ #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" -#include "gl/error.h" #include "gl/intprops.h" #include "gl/xalloc.h" @@ -66,63 +62,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,48 +77,26 @@ 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); - - printf ("%s:%d %p %d\n", __FILE__, __LINE__, ssp->spreadsheet, ssp->spreadsheet->type); - - if (ssp->spreadsheet == NULL) - ssp->spreadsheet = ods_probe (sri.file_name); + if (ia->spreadsheet == NULL) + ia->spreadsheet = ods_probe (file->file_name, false); - printf ("%s:%d %p %d\n", __FILE__, __LINE__, ssp->spreadsheet, ssp->spreadsheet->type); - - if (ssp->spreadsheet) - { - - // update_assistant (ia); - } - else + if (ia->spreadsheet == NULL) { - printf ("%s:%d %p\n", __FILE__, __LINE__, ssp->spreadsheet); - struct string input; struct line_reader *reader = line_reader_for_file (file->encoding, file->file_name, O_RDONLY); if (reader == NULL) { - msg (ME, _("Could not open `%s': %s"), - file->file_name, strerror (errno)); + msg_error (errno, _("Could not open `%s'"), + file->file_name); return false; } @@ -219,17 +138,27 @@ init_file (struct import_assistant *ia, GtkWindow *parent_window) return false; } + /* Estimate the number of lines in the file. */ if (file->line_cnt < MAX_PREVIEW_LINES) - file->total_lines = file->line_cnt; + { + file->total_lines = file->line_cnt; + file->total_is_exact = true; + } else { struct stat s; off_t position = line_reader_tell (reader); if (fstat (line_reader_fileno (reader), &s) == 0 && position > 0) - file->total_lines = (double) file->line_cnt / position * s.st_size; + { + file->total_lines = (double) file->line_cnt / position * s.st_size; + file->total_is_exact = false; + } else + { file->total_lines = 0; + file->total_is_exact = true; + } } line_reader_close (reader); @@ -273,14 +202,14 @@ choose_file (GtkWindow *parent_window, gchar **encodingp) GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import Delimited Text Data"), parent_window, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Open"), GTK_RESPONSE_ACCEPT, NULL); 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); @@ -313,7 +242,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); @@ -323,7 +252,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));