X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fgnumeric-reader.c;h=9193cfb061c4949be89b8467877174bcbf1a0264;hb=bbec8db61a8288576c4d2f158c24c1e429a21ee4;hp=07b88163398f7df9a4b6aa7380b5fe6f0e607369;hpb=1509c6773d7302a2753c4f47b3e52fc5e3cca185;p=pspp diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c index 07b8816339..9193cfb061 100644 --- a/src/data/gnumeric-reader.c +++ b/src/data/gnumeric-reader.c @@ -28,12 +28,10 @@ #include "spreadsheet-reader.h" -#include "c-xvasprintf.h" - #if !GNM_SUPPORT struct casereader * -gnumeric_open_reader (struct spreadsheet_read_info *gri, struct spreadsheet_read_options *opts, struct dictionary **dict) +gnumeric_open_reader (const struct spreadsheet_read_options *opts, struct dictionary **dict) { msg (ME, _("Support for %s files was not compiled into this installation of PSPP"), "Gnumeric"); @@ -65,6 +63,7 @@ static void gnm_file_casereader_destroy (struct casereader *, void *); static struct ccase *gnm_file_casereader_read (struct casereader *, void *); + static const struct casereader_class gnm_file_casereader_class = { gnm_file_casereader_read, @@ -89,7 +88,8 @@ enum reader_state struct sheet_detail { - xmlChar *name; + /* The name of the sheet (utf8 encoding) */ + char *name; int start_col; int stop_col; @@ -104,6 +104,7 @@ struct sheet_detail struct gnumeric_reader { struct spreadsheet spreadsheet; + int ref_cnt; /* The libxml reader for this instance */ xmlTextReaderPtr xtr; @@ -134,19 +135,44 @@ struct gnumeric_reader }; +void +gnumeric_destroy (struct spreadsheet *s) +{ + struct gnumeric_reader *r = (struct gnumeric_reader *) s; + + +#if 0 + if (0 == --r->ref_cnt) + { + int i; + + for (i = 0; i < s->n_sheets; ++i) + { + xmlFree (r->sheets[i].name); + } + + free (r->sheets); + + free (r); + } +#endif +} + + const char * gnumeric_get_sheet_name (struct spreadsheet *s, int n) { struct gnumeric_reader *gr = (struct gnumeric_reader *) s; assert (n < s->n_sheets); - return gr->sheets[n].name; // Kludge: Assumes the encoding is utf8 + return gr->sheets[n].name; } static void process_node (struct gnumeric_reader *r); + char * gnumeric_get_sheet_range (struct spreadsheet *s, int n) { @@ -176,9 +202,11 @@ static void gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_) { struct gnumeric_reader *r = r_; + if ( r == NULL) return ; +#if 0 if ( r->xtr) xmlFreeTextReader (r->xtr); r->xtr = NULL; @@ -188,19 +216,11 @@ gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_) caseproto_unref (r->proto); -#if 0 - for (i = 0; i < r->spreadsheet.n_sheets; ++i) - { - xmlFree (r->sheets[i].name); - } - - free (r->sheets); - - - free (r); + gnumeric_destroy (&r->spreadsheet); #endif } + static void process_node (struct gnumeric_reader *r) { @@ -208,10 +228,9 @@ process_node (struct gnumeric_reader *r) if (name == NULL) name = xmlStrdup (_xml ("--")); - r->node_type = xmlTextReaderNodeType (r->xtr); - switch ( r->state) + switch (r->state) { case STATE_PRE_INIT: r->current_sheet = -1; @@ -244,7 +263,7 @@ process_node (struct gnumeric_reader *r) } else if (XML_READER_TYPE_TEXT == r->node_type) { - r->sheets [r->spreadsheet.n_sheets - 1].name = xmlTextReaderValue (r->xtr); + r->sheets [r->spreadsheet.n_sheets - 1].name = CHAR_CAST (char *, xmlTextReaderValue (r->xtr)); } break; @@ -426,15 +445,21 @@ struct var_spec }; -void -gnumeric_destroy (struct spreadsheet *s) +static void +gnumeric_error_handler (void *ctx, const char *mesg, + UNUSED xmlParserSeverities sev, xmlTextReaderLocatorPtr loc) { - gnm_file_casereader_destroy (NULL, s); + struct gnumeric_reader *r = ctx; + + msg (MW, _("There was a problem whilst reading the %s file `%s' (near line %d): `%s'"), + "Gnumeric", + r->spreadsheet.file_name, + xmlTextReaderLocatorLineNumber (loc), + mesg); } - static struct gnumeric_reader * -gnumeric_reopen (struct gnumeric_reader *r, const char *filename) +gnumeric_reopen (struct gnumeric_reader *r, const char *filename, bool show_errors) { int ret; @@ -454,9 +479,11 @@ gnumeric_reopen (struct gnumeric_reader *r, const char *filename) if (NULL == gz) return NULL; + xtr = xmlReaderForIO ((xmlInputReadCallback) gzread, - (xmlInputCloseCallback) gzclose, gz, - NULL, NULL, 0); + (xmlInputCloseCallback) gzclose, gz, + NULL, NULL, + show_errors ? 0 : (XML_PARSE_NOERROR | XML_PARSE_NOWARNING) ); if (xtr == NULL) { @@ -470,6 +497,9 @@ gnumeric_reopen (struct gnumeric_reader *r, const char *filename) r->spreadsheet.n_sheets = -1; r->spreadsheet.file_name = filename; } + + if (show_errors) + xmlTextReaderSetErrorHandler (xtr, gnumeric_error_handler, r); r->target_sheet = NULL; r->target_sheet_index = -1; @@ -477,6 +507,7 @@ gnumeric_reopen (struct gnumeric_reader *r, const char *filename) r->row = r->col = -1; r->state = STATE_PRE_INIT; r->xtr = xtr; + r->ref_cnt++; /* Advance to the start of the workbook. This gives us some confidence that we are actually dealing with a gnumeric @@ -488,6 +519,7 @@ gnumeric_reopen (struct gnumeric_reader *r, const char *filename) process_node (r); } + if ( ret != 1) { /* Does not seem to be a gnumeric file */ @@ -498,14 +530,30 @@ gnumeric_reopen (struct gnumeric_reader *r, const char *filename) r->spreadsheet.type = SPREADSHEET_GNUMERIC; + if (show_errors) + { + const xmlChar *enc = xmlTextReaderConstEncoding (r->xtr); + xmlCharEncoding xce = xmlParseCharEncoding (CHAR_CAST (const char *, enc)); + + if ( XML_CHAR_ENCODING_UTF8 != xce) + { + /* I have been told that ALL gnumeric files are UTF8 encoded. If that is correct, this + can never happen. */ + msg (MW, _("The gnumeric file `%s' is encoded as %s instead of the usual UTF-8 encoding. " + "Any non-ascii characters will be incorrectly imported."), + r->spreadsheet.file_name, + enc); + } + } + return r; } struct spreadsheet * -gnumeric_probe (const char *filename) +gnumeric_probe (const char *filename, bool report_errors) { - struct gnumeric_reader *r = gnumeric_reopen (NULL, filename); + struct gnumeric_reader *r = gnumeric_reopen (NULL, filename, report_errors); return &r->spreadsheet; } @@ -513,9 +561,9 @@ gnumeric_probe (const char *filename) struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet, - const struct spreadsheet_read_info *gri, - struct spreadsheet_read_options *opts) + const struct spreadsheet_read_options *opts) { + int x = 0; struct gnumeric_reader *r = NULL; unsigned long int vstart = 0; int ret; @@ -527,7 +575,9 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, r = (struct gnumeric_reader *) (spreadsheet); if (r->row != -1) - r = gnumeric_reopen (r, NULL); + r = gnumeric_reopen (r, NULL, true); + + if ( opts->cell_range ) { @@ -575,7 +625,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, n_cases = MIN (n_cases, r->stop_row - r->start_row + 1); } - if ( gri->read_names ) + if ( opts->read_names ) { r->start_row++; n_cases --; @@ -619,7 +669,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, if ( r->row < r->start_row) { - if ( gri->read_names ) + if ( opts->read_names ) { var_spec [idx].name = xstrdup (text); } @@ -629,8 +679,8 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, var_spec [idx].first_value = xmlStrdup (value); if (-1 == var_spec [idx].width ) - var_spec [idx].width = (gri->asw == -1) ? - ROUND_UP (strlen(text), SPREADSHEET_DEFAULT_WIDTH) : gri->asw; + var_spec [idx].width = (opts->asw == -1) ? + ROUND_UP (strlen(text), SPREADSHEET_DEFAULT_WIDTH) : opts->asw; } free (value); @@ -690,13 +740,15 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, r->first_case = case_create (r->proto); case_set_missing (r->first_case); - int x = 0; + for ( i = 0 ; i < n_var_specs ; ++i ) { + const struct variable *var; + if ( (var_spec[i].name == NULL) && (var_spec[i].first_value == NULL)) continue; - const struct variable *var = dict_get_var (r->dict, x++); + var = dict_get_var (r->dict, x++); convert_xml_string_to_value (r->first_case, var, var_spec[i].first_value); @@ -710,16 +762,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, free (var_spec); - - if (opts->cell_range == NULL) - { - opts->cell_range = c_xasprintf ("%c%d:%c%ld", - r->start_col + 'A', - r->start_row, - r->stop_col + 'A' + caseproto_get_n_widths (r->proto), - r->start_row + n_cases); - } - + return casereader_create_sequential (NULL, r->proto,