/* 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
#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"
int target_sheet_index;
xmlChar *target_sheet_name;
-
+
/* State data for the meta data */
struct state_data msd;
{
xmlFree (r->sheets[i].name);
}
-
+
+ dict_destroy (r->dict);
+
zip_reader_destroy (r->zreader);
free (r->sheets);
-
free (s->file_name);
-
free (r);
}
}
if ( 0 == xmlStrcmp (r->target_sheet_name, msd->current_sheet_name))
return true;
}
-
+
if (r->target_sheet_index == msd->current_sheet + 1)
return true;
assert (n < s->n_sheets);
- while (
+ while (
(r->n_allocated_sheets <= n)
|| or->state != STATE_SPREADSHEET
)
{
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
)
{
break;
case STATE_SPREADSHEET:
if (0 == xmlStrcasecmp (name, _xml("table:table"))
- &&
+ &&
(XML_READER_TYPE_ELEMENT == r->node_type))
{
xmlFree (r->current_sheet_name);
}
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;
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;
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)
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
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);
}
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);
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,
r->spreadsheet.type = SPREADSHEET_ODS;
- if (report_errors)
+ if (report_errors)
xmlTextReaderSetErrorHandler (xtr, ods_error_handler, r);
return xtr;
{
int sheet_count;
struct ods_reader *r = xzalloc (sizeof *r);
- xmlTextReaderPtr xtr;
+ xmlTextReaderPtr xtr;
struct zip_reader *zr;
ds_init_empty (&r->zip_errs);
}
struct casereader *
-ods_make_reader (struct spreadsheet *spreadsheet,
+ods_make_reader (struct spreadsheet *spreadsheet,
const struct spreadsheet_read_options *opts)
{
intf ret = 0;
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)))
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)
{
/* 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;
}
{
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;
&ods_file_casereader_class, r);
error:
-
+
for ( i = 0 ; i < n_var_specs ; ++i )
{
free (var_spec[i].firstval.type);
free (var_spec);
- dict_destroy (r->spreadsheet.dict);
- r->spreadsheet.dict = NULL;
ods_file_casereader_destroy (NULL, r);
return NULL;
/* 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)
)
{
}
- 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)
)
c = case_create (r->proto);
case_set_missing (c);
-
+
while (1 == xmlTextReaderRead (r->rsd.xtr))
{
process_node (r, &r->rsd);
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;
xmlFree (type);
xmlFree (val_string);
-
+
return c;
}
#endif
projects / pspp / blobdiff