/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012,
+ 2013, 2015, 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
#define _(msgid) gettext (msgid)
#define N_(msgid) (msgid)
-static bool parse_spreadsheet (struct lexer *lexer, char **filename, struct spreadsheet_read_info *sri,
+
+#ifdef ODF_READ_SUPPORT
+static const bool odf_read_support = true;
+#else
+static const bool odf_read_support = false;
+struct spreadsheet *ods_probe (const char *filename, bool report_errors){}
+struct casereader * ods_make_reader (struct spreadsheet *spreadsheet,
+ const struct spreadsheet_read_options *opts){}
+void ods_unref (struct spreadsheet *r){}
+#endif
+
+#ifdef GNM_READ_SUPPORT
+static const bool gnm_read_support = true;
+#else
+static const bool gnm_read_support = false;
+struct spreadsheet *gnumeric_probe (const char *filename, bool report_errors){}
+struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet,
+ const struct spreadsheet_read_options *opts){}
+void gnumeric_unref (struct spreadsheet *r){}
+
+#endif
+
+static bool parse_spreadsheet (struct lexer *lexer, char **filename,
struct spreadsheet_read_options *opts);
-static void destroy_spreadsheet_read_info (struct spreadsheet_read_info *, struct spreadsheet_read_options *);
+static void destroy_spreadsheet_read_info (struct spreadsheet_read_options *);
static int parse_get_txt (struct lexer *lexer, struct dataset *);
static int parse_get_psql (struct lexer *lexer, struct dataset *);
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);
lex_match_id (lexer, "ODS"))
{
char *filename = NULL;
- struct casereader *reader = NULL;
- struct dictionary *dict = NULL;
- struct spreadsheet_read_info sri;
- struct spreadsheet_read_options opts;
- if (!parse_spreadsheet (lexer, &filename, &sri, &opts))
+ if (!parse_spreadsheet (lexer, &filename, &opts))
goto error;
- if ( 0 == strncasecmp (tok, "GNM", 3))
- {
- struct spreadsheet *spreadsheet = gnumeric_probe (filename);
- reader = gnumeric_make_reader (spreadsheet, &sri, &opts);
- dict = spreadsheet->dict;
- }
- else if (0 == strncasecmp (tok, "ODS", 3))
- {
- struct spreadsheet *spreadsheet = ods_probe (filename);
- reader = ods_make_reader (spreadsheet, &sri, &opts);
- dict = spreadsheet->dict;
- }
+ struct spreadsheet *spreadsheet = NULL;
+ if ( gnm_read_support && 0 == strncasecmp (tok, "GNM", 3))
+ spreadsheet = gnumeric_probe (filename, true);
+ else if ( odf_read_support && 0 == strncasecmp (tok, "ODS", 3))
+ spreadsheet = ods_probe (filename, true);
+ free (filename);
+ if (spreadsheet == NULL)
+ goto error;
+
+ struct casereader *reader = spreadsheet_make_reader (spreadsheet, &opts);
if (reader)
{
- dataset_set_dict (ds, dict);
+ dataset_set_dict (ds, dict_clone (spreadsheet->dict));
dataset_set_source (ds, reader);
- destroy_spreadsheet_read_info (&sri, &opts);
free (tok);
+ destroy_spreadsheet_read_info (&opts);
+ spreadsheet_unref (spreadsheet);
return CMD_SUCCESS;
}
- destroy_spreadsheet_read_info (&sri, &opts);
+ spreadsheet_unref (spreadsheet);
}
else
msg (SE, _("Unsupported TYPE %s."), tok);
+
error:
+ destroy_spreadsheet_read_info (&opts);
free (tok);
return CMD_FAILURE;
}
if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH"))
{
lex_match (lexer, T_EQUALS);
- psql.str_width = lex_integer (lexer);
- lex_get (lexer);
+ if (lex_force_int (lexer))
+ {
+ psql.str_width = lex_integer (lexer);
+ lex_get (lexer);
+ }
}
else if ( lex_match_id (lexer, "BSIZE"))
{
lex_match (lexer, T_EQUALS);
- psql.bsize = lex_integer (lexer);
- lex_get (lexer);
+ if (lex_force_int (lexer))
+ {
+ psql.bsize = lex_integer (lexer);
+ lex_get (lexer);
+ }
}
else if ( lex_match_id (lexer, "UNENCRYPTED"))
{
}
static bool
-parse_spreadsheet (struct lexer *lexer, char **filename, struct spreadsheet_read_info *sri,
+parse_spreadsheet (struct lexer *lexer, char **filename,
struct spreadsheet_read_options *opts)
{
opts->sheet_index = 1;
opts->sheet_name = NULL;
opts->cell_range = NULL;
- sri->read_names = true;
- sri->asw = -1;
+ opts->read_names = true;
+ opts->asw = -1;
lex_force_match (lexer, T_SLASH);
if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH"))
{
lex_match (lexer, T_EQUALS);
- sri->asw = lex_integer (lexer);
- lex_get (lexer);
+ if (lex_force_int (lexer))
+ {
+ opts->asw = lex_integer (lexer);
+ lex_get (lexer);
+ }
}
else if (lex_match_id (lexer, "SHEET"))
{
}
else if (lex_match_id (lexer, "INDEX"))
{
+ if (!lex_force_int (lexer))
+ goto error;
+
opts->sheet_index = lex_integer (lexer);
if (opts->sheet_index <= 0)
{
if ( lex_match_id (lexer, "ON"))
{
- sri->read_names = true;
+ opts->read_names = true;
}
else if (lex_match_id (lexer, "OFF"))
{
- sri->read_names = false;
+ opts->read_names = false;
}
else
{
return true;
error:
- destroy_spreadsheet_read_info (sri, opts);
return false;
}
data_parser_set_type (parser, DP_DELIMITED);
data_parser_set_span (parser, false);
data_parser_set_quotes (parser, ss_empty ());
+ data_parser_set_quote_escape (parser, true);
data_parser_set_empty_line_has_field (parser, true);
for (;;)
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));
lex_match (lexer, T_EQUALS);
if (lex_match (lexer, T_ALL))
{
- data_parser_set_case_limit (parser, -1);
- data_parser_set_case_percent (parser, 100);
+ /* Nothing to do. */
}
else if (lex_match_id (lexer, "FIRST"))
{
if (!lex_force_int (lexer))
goto error;
- if (lex_integer (lexer) < 1)
- {
- msg (SE, _("Value of FIRST must be at least 1."));
- goto error;
- }
- data_parser_set_case_limit (parser, lex_integer (lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "PERCENT"))
{
if (!lex_force_int (lexer))
goto error;
- if (lex_integer (lexer) < 1 || lex_integer (lexer) > 100)
- {
- msg (SE, _("Value of PERCENT must be between 1 and 100."));
- goto error;
- }
- data_parser_set_case_percent (parser, lex_integer (lexer));
lex_get (lexer);
}
+ msg (SW, _("Ignoring obsolete IMPORTCASES subcommand. (N OF CASES "
+ "or SAMPLE may be used to substitute.)"));
}
else if (lex_match_id_n (lexer, "DELIMITERS", 4))
{
data_parser_set_quotes (parser, lex_tokss (lexer));
lex_get (lexer);
}
- else if (settings_get_syntax () == ENHANCED
- && lex_match_id (lexer, "ESCAPE"))
- data_parser_set_quote_escape (parser, true);
else if (lex_match_id (lexer, "VARIABLES"))
break;
else
static void
-destroy_spreadsheet_read_info (UNUSED struct spreadsheet_read_info *sri,
- struct spreadsheet_read_options *opts)
+destroy_spreadsheet_read_info (struct spreadsheet_read_options *opts)
{
- free (opts->sheet_name);
free (opts->cell_range);
+ free (opts->sheet_name);
}
projects / pspp / blobdiff