int col_span;
};
+static void
+state_data_destroy (struct state_data *sd)
+{
+ xmlFree (sd->current_sheet_name);
+ xmlFreeTextReader (sd->xtr);
+}
+
struct ods_reader
{
struct spreadsheet spreadsheet;
int target_sheet_index;
xmlChar *target_sheet_name;
- struct state_data foo;
+ /* State data for the meta data */
+ struct state_data msd;
+
+ /* State data for the reader */
struct state_data rsd;
int start_row;
void
ods_destroy (struct spreadsheet *s)
{
-#if 0
struct ods_reader *r = (struct ods_reader *) s;
if (--r->ref_cnt == 0)
{
int i;
+ state_data_destroy (&r->msd);
for (i = 0; i < r->n_allocated_sheets; ++i)
{
xmlFree (r->sheets[i].name);
}
-
+
zip_reader_destroy (r->zreader);
free (r->sheets);
+
free (r);
}
-#endif
}
static bool
-reading_target_sheet (const struct ods_reader *r, const struct state_data *foo)
+reading_target_sheet (const struct ods_reader *r, const struct state_data *msd)
{
if (r->target_sheet_name != NULL)
{
- if ( 0 == xmlStrcmp (r->target_sheet_name, foo->current_sheet_name))
+ if ( 0 == xmlStrcmp (r->target_sheet_name, msd->current_sheet_name))
return true;
}
- if (r->target_sheet_index == foo->current_sheet + 1)
+ if (r->target_sheet_index == msd->current_sheet + 1)
return true;
return false;
ods_get_sheet_name (struct spreadsheet *s, int n)
{
struct ods_reader *r = (struct ods_reader *) s;
- struct state_data *or = &r->foo;
+ struct state_data *or = &r->msd;
assert (n < s->n_sheets);
ods_get_sheet_range (struct spreadsheet *s, int n)
{
struct ods_reader *r = (struct ods_reader *) s;
- struct state_data *or = &r->foo;
+ struct state_data *or = &r->msd;
assert (n < s->n_sheets);
static void
ods_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
{
-#if 0
struct ods_reader *r = r_;
if ( r == NULL)
return ;
- if (r->xtr)
- xmlFreeTextReader (r->xtr);
- r->xtr = NULL;
+ state_data_destroy (&r->rsd);
if ( ! ds_is_empty (&r->ods_errs))
msg (ME, "%s", ds_cstr (&r->ods_errs));
caseproto_unref (r->proto);
- xmlFree (r->current_sheet_name);
xmlFree (r->target_sheet_name);
ods_destroy (&r->spreadsheet);
-#endif
}
if ( content == NULL)
return NULL;
- zip_member_ref (content);
xtr = xmlReaderForIO ((xmlInputReadCallback) zip_member_read,
- (xmlInputCloseCallback) zip_member_finish,
+ (xmlInputCloseCallback) NULL,
content, NULL, NULL,
report_errors ? 0 : (XML_PARSE_NOERROR | XML_PARSE_NOWARNING) );
{
goto error;
}
- r->foo.xtr = xtr;
- r->foo.row = 0;
- r->foo.col = 0;
- r->foo.current_sheet = 0;
- r->foo.state = STATE_INIT;
+ r->msd.xtr = xtr;
+ r->msd.row = 0;
+ r->msd.col = 0;
+ r->msd.current_sheet = 0;
+ r->msd.state = STATE_INIT;
r->spreadsheet.n_sheets = sheet_count;
ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
{
struct ccase *c = NULL;
- xmlChar *val_string = NULL;
- xmlChar *type = NULL;
struct ods_reader *r = r_;
if (!r->used_first_case)
c = case_create (r->proto);
case_set_missing (c);
+ xmlChar *val_string = NULL;
+ xmlChar *type = NULL;
+
while (1 == xmlTextReaderRead (r->rsd.xtr))
{
process_node (r, &r->rsd);