/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009, 2010, 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
#include "spreadsheet-reader.h"
-#if !GNM_SUPPORT
+#if !GNM_READ_SUPPORT
-struct casereader *
-gnumeric_open_reader (const struct spreadsheet_read_options *opts, struct dictionary **dict)
+struct spreadsheet *
+gnumeric_probe (const char *filename, bool report_errors)
{
- msg (ME, _("Support for %s files was not compiled into this installation of PSPP"), "Gnumeric");
+ if (report_errors)
+ msg (ME, _("Support for %s files was not compiled into this installation of PSPP"), "Gnumeric");
+
+ return NULL;
+}
+const char *
+gnumeric_get_sheet_name (struct spreadsheet *s, int n)
+{
return NULL;
}
+char *
+gnumeric_get_sheet_range (struct spreadsheet *s, int n)
+{
+ return NULL;
+}
+
+struct casereader *
+gnumeric_make_reader (struct spreadsheet *spreadsheet,
+ const struct spreadsheet_read_options *opts)
+{
+ return NULL;
+}
+
+void
+gnumeric_unref (struct spreadsheet *r)
+{
+}
+
+
#else
#include "data/gnumeric-reader.h"
int maxrow;
};
-struct state_data
+struct state_data
{
/* The libxml reader for this instance */
xmlTextReaderPtr xtr;
struct gnumeric_reader
{
struct spreadsheet spreadsheet;
- int ref_cnt;
struct state_data rsd;
struct state_data msd;
int stop_col;
int start_row;
int stop_row;
-
+
struct sheet_detail *sheets;
const xmlChar *target_sheet;
void
-gnumeric_destroy (struct spreadsheet *s)
+gnumeric_unref (struct spreadsheet *s)
{
struct gnumeric_reader *r = (struct gnumeric_reader *) s;
- if (0 == --r->ref_cnt)
+ if (0 == --s->ref_cnt)
{
int i;
{
xmlFree (r->sheets[i].name);
}
-
+
+
free (r->sheets);
state_data_destroy (&r->msd);
+ dict_destroy (r->dict);
+
+ free (s->file_name);
+
free (r);
}
}
struct gnumeric_reader *gr = (struct gnumeric_reader *) s;
assert (n < s->n_sheets);
- return gr->sheets[n].name;
+ return gr->sheets[n].name;
}
{
int ret;
struct gnumeric_reader *gr = (struct gnumeric_reader *) s;
-
+
assert (n < s->n_sheets);
- while (
+ while (
(gr->sheets[n].stop_col == -1)
- &&
+ &&
(1 == (ret = xmlTextReaderRead (gr->msd.xtr)))
)
{
if (r->first_case && ! r->used_first_case )
case_unref (r->first_case);
- if (r->proto)
+ if (r->proto)
caseproto_unref (r->proto);
- gnumeric_destroy (&r->spreadsheet);
+ gnumeric_unref (&r->spreadsheet);
}
v,
var_get_width (var),
"UTF-8");
-
+
if (m)
{
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);
}
UNUSED xmlParserSeverities sev, xmlTextReaderLocatorPtr loc)
{
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,
static struct gnumeric_reader *
gnumeric_reopen (struct gnumeric_reader *r, const char *filename, bool show_errors)
-{
+{
int ret = -1;
struct state_data *sd;
{
r = xzalloc (sizeof *r);
r->spreadsheet.n_sheets = -1;
- r->spreadsheet.file_name = filename;
+ r->spreadsheet.file_name = strdup (filename);
sd = &r->msd;
}
else
{
sd = &r->rsd;
}
-
- if (show_errors)
+
+ if (show_errors)
xmlTextReaderSetErrorHandler (xtr, gnumeric_error_handler, r);
r->target_sheet = NULL;
sd->row = sd->col = -1;
sd->state = STATE_PRE_INIT;
sd->xtr = xtr;
- r->ref_cnt++;
+ r->spreadsheet.ref_cnt++;
+
/* Advance to the start of the workbook.
This gives us some confidence that we are actually dealing with a gnumeric
if ( ret != 1)
{
/* Does not seem to be a gnumeric file */
- xmlFreeTextReader (sd->xtr);
- free (r);
+ gnumeric_unref (&r->spreadsheet);
return NULL;
}
if ( XML_CHAR_ENCODING_UTF8 != xce)
{
- /* I have been told that ALL gnumeric files are UTF8 encoded. If that is correct, this
+ /* 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."),
process_node (r, &r->rsd);
- if ( r->rsd.row > r->start_row )
+ if ( r->rsd.row > r->start_row )
{
xmlChar *attr =
xmlTextReaderGetAttribute (r->rsd.xtr, _xml ("ValueType"));
-
+
r->vtype = _xmlchar_to_int (attr);
-
+
xmlFree (attr);
break;
}
continue;
var = dict_get_var (r->dict, x++);
-
+
convert_xml_string_to_value (r->first_case, var,
- var_spec[i].first_value,
+ var_spec[i].first_value,
var_spec[i].first_type,
r->rsd.col + i - 1,
r->rsd.row - 1);
}
free (var_spec);
-
+
return casereader_create_sequential
(NULL,
}
free (var_spec);
- dict_destroy (spreadsheet->dict);
- spreadsheet->dict = NULL;
gnm_file_casereader_destroy (NULL, r);
const int idx = r->rsd.col - r->start_col;
const struct variable *var = dict_get_var (r->dict, idx);
- convert_xml_string_to_value (c, var, value, r->vtype,
+ convert_xml_string_to_value (c, var, value, r->vtype,
r->rsd.col, r->rsd.row);
xmlFree (value);
}
-#endif /* GNM_SUPPORT */
+#endif /* GNM_READ_SUPPORT */