#define _(msgid) gettext (msgid)
#define N_(msgid) (msgid)
+
+#ifdef ODF_READ_SUPPORT
+static const bool odf_read_support = true;
+#else
+static const bool odf_read_support = false;
+#endif
+
+#ifdef GNM_READ_SUPPORT
+static const bool gnm_read_support = true;
+#else
+static const bool gnm_read_support = false;
+#endif
+
static bool parse_spreadsheet (struct lexer *lexer, char **filename,
struct spreadsheet_read_options *opts);
cmd_get_data (struct lexer *lexer, struct dataset *ds)
{
char *tok = NULL;
+ struct spreadsheet_read_options opts;
+
+ opts.sheet_name = NULL;
+ opts.sheet_index = -1;
+ opts.cell_range = NULL;
+ opts.read_names = false;
+ opts.asw = -1;
+
lex_force_match (lexer, T_SLASH);
if (!lex_force_match_id (lexer, "TYPE"))
- return CMD_FAILURE;
+ goto error;
lex_force_match (lexer, T_EQUALS);
char *filename = NULL;
struct casereader *reader = NULL;
struct dictionary *dict = NULL;
- struct spreadsheet_read_options opts;
+
if (!parse_spreadsheet (lexer, &filename, &opts))
goto error;
- if ( 0 == strncasecmp (tok, "GNM", 3))
+ if ( gnm_read_support && 0 == strncasecmp (tok, "GNM", 3))
{
struct spreadsheet *spreadsheet = gnumeric_probe (filename, true);
if (spreadsheet == NULL)
goto error;
reader = gnumeric_make_reader (spreadsheet, &opts);
dict = spreadsheet->dict;
+ gnumeric_destroy (spreadsheet);
}
- else if (0 == strncasecmp (tok, "ODS", 3))
+ else if ( odf_read_support && 0 == strncasecmp (tok, "ODS", 3))
{
struct spreadsheet *spreadsheet = ods_probe (filename, true);
if (spreadsheet == NULL)
goto error;
reader = ods_make_reader (spreadsheet, &opts);
dict = spreadsheet->dict;
+ ods_destroy (spreadsheet);
}
+ free (filename);
+
if (reader)
{
dataset_set_dict (ds, dict);
destroy_spreadsheet_read_info (&opts);
return CMD_SUCCESS;
}
- destroy_spreadsheet_read_info (&opts);
}
else
msg (SE, _("Unsupported TYPE %s."), tok);
-
-
error:
+ destroy_spreadsheet_read_info (&opts);
free (tok);
return CMD_FAILURE;
}
goto error;
if (lex_integer (lexer) < 1)
{
- msg (SE, _("Value of FIRSTCASE must be 1 or greater."));
+ msg (SE, _("Value of %s must be 1 or greater."), "FIRSTCASE");
goto error;
}
data_parser_set_skip (parser, lex_integer (lexer) - 1);
goto error;
if (lex_integer (lexer) < 1)
{
- msg (SE, _("Value of FIXCASE must be at least 1."));
+ msg (SE, _("Value of %s must be 1 or greater."), "FIXCASE");
goto error;
}
data_parser_set_records (parser, lex_integer (lexer));
goto error;
if (lex_integer (lexer) < 1)
{
- msg (SE, _("Value of FIRST must be at least 1."));
+ msg (SE, _("Value of %s must be 1 or greater."), "FIRST");
goto error;
}
data_parser_set_case_limit (parser, lex_integer (lexer));
goto error;
if (lex_integer (lexer) < 1 || lex_integer (lexer) > 100)
{
- msg (SE, _("Value of PERCENT must be between 1 and 100."));
+ msg (SE, _("Value of %s must be between 1 and 100."), "PERCENT");
goto error;
}
data_parser_set_case_percent (parser, lex_integer (lexer));
destroy_spreadsheet_read_info (struct spreadsheet_read_options *opts)
{
free (opts->cell_range);
+ free (opts->sheet_name);
}