#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");
static struct ccase *gnm_file_casereader_read (struct casereader *, void *);
+
static const struct casereader_class gnm_file_casereader_class =
{
gnm_file_casereader_read,
struct sheet_detail
{
- xmlChar *name;
+ /* The name of the sheet (utf8 encoding) */
+ char *name;
int start_col;
int stop_col;
};
+void
+gnumeric_destroy (struct spreadsheet *s)
+{
+ struct gnumeric_reader *r = s;
+ int i;
+
+ for (i = 0; i < s->n_sheets; ++i)
+ {
+ xmlFree (r->sheets[i].name);
+ }
+
+ free (r->sheets);
+
+ free (r);
+}
+
+
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)
{
case_unref (r->first_case);
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);
-#endif
}
+
static void
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;
};
-void
-gnumeric_destroy (struct spreadsheet *s)
-{
- gnm_file_casereader_destroy (NULL, s);
-}
-
-
static void
gnumeric_error_handler (void *ctx, const char *mesg,
UNUSED xmlParserSeverities sev, xmlTextReaderLocatorPtr loc)
{
struct gnumeric_reader *r = ctx;
- msg (MW, _("There was a problem whilst reading the Gnumeric file `%s' (near line %d): `%s'"),
+ msg (MW, _("There was a problem whilst reading the %s file `%s' (near line %d): `%s'"),
+ "Gnumeric",
r->spreadsheet.file_name,
xmlTextReaderLocatorLineNumber (loc),
mesg);
process_node (r);
}
+
if ( ret != 1)
{
/* Does not seem to be a gnumeric file */
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 casereader *
gnumeric_make_reader (struct spreadsheet *spreadsheet,
- const struct spreadsheet_read_info *gri,
const struct spreadsheet_read_options *opts)
{
int x = 0;
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 --;
if ( r->row < r->start_row)
{
- if ( gri->read_names )
+ if ( opts->read_names )
{
var_spec [idx].name = xstrdup (text);
}
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);