/* PSPP - a program for statistical analysis.
Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012,
- 2013, 2015 Free Software Foundation, Inc.
+ 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
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,
lex_match_id (lexer, "ODS"))
{
char *filename = NULL;
- struct casereader *reader = NULL;
- struct dictionary *dict = NULL;
-
if (!parse_spreadsheet (lexer, &filename, &opts))
goto error;
+ struct spreadsheet *spreadsheet = NULL;
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);
- }
+ spreadsheet = gnumeric_probe (filename, true);
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);
- }
+ 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);
free (tok);
destroy_spreadsheet_read_info (&opts);
+ spreadsheet_unref (spreadsheet);
return CMD_SUCCESS;
}
+ spreadsheet_unref (spreadsheet);
}
else
msg (SE, _("Unsupported TYPE %s."), tok);
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 %s must be 1 or greater."), "FIRST");
- 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 %s must be between 1 and 100."), "PERCENT");
- 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))
{