X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fods-reader.c;h=736985ea8be29a8c6bc4947de7591e7f889f89b5;hb=6abd8f3ba67ec3751fc47487c1e09cf8e8de144a;hp=1b828d1e36a186a9e532c4c88871881e347d23a6;hpb=96e7681bc36b5aa93ed794515ac7b119e3d35651;p=pspp diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c index 1b828d1e36..736985ea8b 100644 --- a/src/data/ods-reader.c +++ b/src/data/ods-reader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc. + Copyright (C) 2011, 2012, 2013, 2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,15 +34,40 @@ #if !ODF_READ_SUPPORT -struct casereader * -ods_open_reader (const struct spreadsheet_read_options *opts, - struct dictionary **dict) +struct spreadsheet * +ods_probe (const char *filename, bool report_errors) { - msg (ME, _("Support for %s files was not compiled into this installation of PSPP"), "OpenDocument"); + if (report_errors) + msg (ME, _("Support for %s files was not compiled into this installation of PSPP"), "OpenDocument"); + + return NULL; +} +const char * +ods_get_sheet_name (struct spreadsheet *s, int n) +{ + return NULL; +} + +char * +ods_get_sheet_range (struct spreadsheet *s, int n) +{ + return NULL; +} + +struct casereader * +ods_make_reader (struct spreadsheet *spreadsheet, + const struct spreadsheet_read_options *opts) +{ return NULL; } + +void +ods_unref (struct spreadsheet *r) +{ +} + #else #include "libpspp/zip-reader.h" @@ -127,10 +152,10 @@ struct ods_reader { struct spreadsheet spreadsheet; struct zip_reader *zreader; - int ref_cnt; + int target_sheet_index; xmlChar *target_sheet_name; - + /* State data for the meta data */ struct state_data msd; @@ -157,11 +182,11 @@ struct ods_reader }; void -ods_destroy (struct spreadsheet *s) +ods_unref (struct spreadsheet *s) { struct ods_reader *r = (struct ods_reader *) s; - if (--r->ref_cnt == 0) + if (--s->ref_cnt == 0) { int i; @@ -170,10 +195,12 @@ ods_destroy (struct spreadsheet *s) { xmlFree (r->sheets[i].name); } - + + dict_destroy (r->dict); + zip_reader_destroy (r->zreader); free (r->sheets); - + free (s->file_name); free (r); } } @@ -188,7 +215,7 @@ reading_target_sheet (const struct ods_reader *r, const struct state_data *msd) if ( 0 == xmlStrcmp (r->target_sheet_name, msd->current_sheet_name)) return true; } - + if (r->target_sheet_index == msd->current_sheet + 1) return true; @@ -207,7 +234,7 @@ ods_get_sheet_name (struct spreadsheet *s, int n) assert (n < s->n_sheets); - while ( + while ( (r->n_allocated_sheets <= n) || or->state != STATE_SPREADSHEET ) @@ -227,12 +254,12 @@ ods_get_sheet_range (struct spreadsheet *s, int n) { struct ods_reader *r = (struct ods_reader *) s; struct state_data *or = &r->msd; - + assert (n < s->n_sheets); - while ( + while ( (r->n_allocated_sheets <= n) - || (r->sheets[n].stop_row == -1) + || (r->sheets[n].stop_row == -1) || or->state != STATE_SPREADSHEET ) { @@ -276,7 +303,7 @@ ods_file_casereader_destroy (struct casereader *reader UNUSED, void *r_) r->target_sheet_name = NULL; - ods_destroy (&r->spreadsheet); + ods_unref (&r->spreadsheet); } @@ -306,7 +333,7 @@ process_node (struct ods_reader *or, struct state_data *r) break; case STATE_SPREADSHEET: if (0 == xmlStrcasecmp (name, _xml("table:table")) - && + && (XML_READER_TYPE_ELEMENT == r->node_type)) { xmlFree (r->current_sheet_name); @@ -337,24 +364,24 @@ process_node (struct ods_reader *or, struct state_data *r) } break; case STATE_TABLE: - if (0 == xmlStrcasecmp (name, _xml("table:table-row")) && + if (0 == xmlStrcasecmp (name, _xml("table:table-row")) && (XML_READER_TYPE_ELEMENT == r->node_type)) { xmlChar *value = xmlTextReaderGetAttribute (r->xtr, _xml ("table:number-rows-repeated")); - + int row_span = value ? _xmlchar_to_int (value) : 1; r->row += row_span; r->col = 0; - + if (! xmlTextReaderIsEmptyElement (r->xtr)) r->state = STATE_ROW; xmlFree (value); } - else if (0 == xmlStrcasecmp (name, _xml("table:table")) && + else if (0 == xmlStrcasecmp (name, _xml("table:table")) && (XML_READER_TYPE_END_ELEMENT == r->node_type)) { r->state = STATE_SPREADSHEET; @@ -362,13 +389,13 @@ process_node (struct ods_reader *or, struct state_data *r) break; case STATE_ROW: if ( (0 == xmlStrcasecmp (name, _xml ("table:table-cell"))) - && + && (XML_READER_TYPE_ELEMENT == r->node_type)) { xmlChar *value = xmlTextReaderGetAttribute (r->xtr, _xml ("table:number-columns-repeated")); - + r->col_span = value ? _xmlchar_to_int (value) : 1; r->col += r->col_span; @@ -408,7 +435,7 @@ process_node (struct ods_reader *or, struct state_data *r) if (or->sheets[r->current_sheet].start_row == -1) or->sheets[r->current_sheet].start_row = r->row - 1; - if ( + if ( (or->sheets[r->current_sheet].start_col == -1) || (or->sheets[r->current_sheet].start_col >= r->col - 1) @@ -431,8 +458,8 @@ process_node (struct ods_reader *or, struct state_data *r) xmlFree (name); } -/* - A struct containing the parameters of a cell's value +/* + A struct containing the parameters of a cell's value parsed from the xml */ struct xml_value @@ -514,7 +541,7 @@ convert_xml_to_value (struct ccase *c, const struct variable *var, char buf [FMT_STRING_LEN_MAX + 1]; char *cell = create_cell_ref (col, row); - msg (MW, _("Cannot convert the value in the spreadsheet cell %s to format (%s): %s"), + msg (MW, _("Cannot convert the value in the spreadsheet cell %s to format (%s): %s"), cell, fmt_to_string (fmt, buf), m); free (cell); } @@ -551,12 +578,12 @@ get_sheet_count (struct zip_reader *zreader) int s = _xmlchar_to_int (attr); xmlFreeTextReader (mxtr); xmlFree (name); - xmlFree (attr); + xmlFree (attr); return s; } - xmlFree (attr); + xmlFree (attr); } - xmlFree (name); + xmlFree (name); } xmlFreeTextReader (mxtr); @@ -568,7 +595,7 @@ ods_error_handler (void *ctx, const char *mesg, UNUSED xmlParserSeverities sev, xmlTextReaderLocatorPtr loc) { struct ods_reader *r = ctx; - + msg (MW, _("There was a problem whilst reading the %s file `%s' (near line %d): `%s'"), "ODF", r->spreadsheet.file_name, @@ -597,7 +624,7 @@ init_reader (struct ods_reader *r, bool report_errors) r->spreadsheet.type = SPREADSHEET_ODS; - if (report_errors) + if (report_errors) xmlTextReaderSetErrorHandler (xtr, ods_error_handler, r); return xtr; @@ -610,7 +637,7 @@ ods_probe (const char *filename, bool report_errors) { int sheet_count; struct ods_reader *r = xzalloc (sizeof *r); - xmlTextReaderPtr xtr; + xmlTextReaderPtr xtr; struct zip_reader *zr; ds_init_empty (&r->zip_errs); @@ -632,7 +659,7 @@ ods_probe (const char *filename, bool report_errors) sheet_count = get_sheet_count (zr); r->zreader = zr; - r->ref_cnt = 1; + r->spreadsheet.ref_cnt = 1; xtr = init_reader (r, report_errors); if (xtr == NULL) @@ -650,7 +677,7 @@ ods_probe (const char *filename, bool report_errors) r->n_allocated_sheets = 0; r->sheets = NULL; - r->spreadsheet.file_name = filename; + r->spreadsheet.file_name = strdup (filename); return &r->spreadsheet; error: @@ -661,7 +688,7 @@ ods_probe (const char *filename, bool report_errors) } struct casereader * -ods_make_reader (struct spreadsheet *spreadsheet, +ods_make_reader (struct spreadsheet *spreadsheet, const struct spreadsheet_read_options *opts) { intf ret = 0; @@ -679,7 +706,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, assert (r); r->read_names = opts->read_names; ds_init_empty (&r->ods_errs); - ++r->ref_cnt; + ++r->spreadsheet.ref_cnt; xtr = init_reader (r, true); if ( xtr == NULL) @@ -717,7 +744,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, r->target_sheet_index = opts->sheet_index; /* Advance to the start of the cells for the target sheet */ - while ( ! reading_target_sheet (r, &r->rsd) + while ( ! reading_target_sheet (r, &r->rsd) || r->rsd.state != STATE_ROW || r->rsd.row <= r->start_row ) { if (1 != (ret = xmlTextReaderRead (r->rsd.xtr))) @@ -753,7 +780,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, if (r->stop_col != -1 && idx > r->stop_col - r->start_col) continue; - if (r->rsd.state == STATE_CELL_CONTENT + if (r->rsd.state == STATE_CELL_CONTENT && XML_READER_TYPE_TEXT == r->rsd.node_type) { @@ -765,7 +792,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, /* xrealloc (unlike realloc) doesn't initialise its memory to 0 */ memset (var_spec + n_var_specs, - 0, + 0, (idx - n_var_specs + 1) * sizeof (*var_spec)); n_var_specs = idx + 1; } @@ -815,7 +842,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, { var_spec = xrealloc (var_spec, sizeof (*var_spec) * (idx + 1)); memset (var_spec + n_var_specs, - 0, + 0, (idx - n_var_specs + 1) * sizeof (*var_spec)); var_spec [idx].name = NULL; @@ -908,7 +935,7 @@ ods_make_reader (struct spreadsheet *spreadsheet, &ods_file_casereader_class, r); error: - + for ( i = 0 ; i < n_var_specs ; ++i ) { free (var_spec[i].firstval.type); @@ -919,8 +946,6 @@ ods_make_reader (struct spreadsheet *spreadsheet, free (var_spec); - dict_destroy (r->spreadsheet.dict); - r->spreadsheet.dict = NULL; ods_file_casereader_destroy (NULL, r); return NULL; @@ -946,7 +971,7 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_) /* Advance to the start of a row. (If there is one) */ - while (r->rsd.state != STATE_ROW + while (r->rsd.state != STATE_ROW && 1 == xmlTextReaderRead (r->rsd.xtr) ) { @@ -954,7 +979,7 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_) } - if ( ! reading_target_sheet (r, &r->rsd) + if ( ! reading_target_sheet (r, &r->rsd) || r->rsd.state < STATE_TABLE || (r->stop_row != -1 && r->rsd.row > r->stop_row + 1) ) @@ -964,7 +989,7 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_) c = case_create (r->proto); case_set_missing (c); - + while (1 == xmlTextReaderRead (r->rsd.xtr)) { process_node (r, &r->rsd); @@ -979,13 +1004,13 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_) val_string = xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("office:value")); } - if (r->rsd.state == STATE_CELL_CONTENT && + if (r->rsd.state == STATE_CELL_CONTENT && r->rsd.node_type == XML_READER_TYPE_TEXT) { int col; struct xml_value *xmv = xzalloc (sizeof *xmv); xmv->text = xmlTextReaderValue (r->rsd.xtr); - xmv->value = val_string; + xmv->value = val_string; val_string = NULL; xmv->type = type; type = NULL; @@ -1014,6 +1039,9 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_) break; } + xmlFree (type); + xmlFree (val_string); + return c; } #endif