/* PSPP - a program for statistical analysis.
Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012,
- 2013 Free Software Foundation, Inc.
+ 2013, 2015 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,
goto error;
reader = gnumeric_make_reader (spreadsheet, &opts);
dict = spreadsheet->dict;
- gnumeric_destroy (spreadsheet);
+ gnumeric_unref (spreadsheet);
}
else if ( odf_read_support && 0 == strncasecmp (tok, "ODS", 3))
{
goto error;
reader = ods_make_reader (spreadsheet, &opts);
dict = spreadsheet->dict;
- ods_destroy (spreadsheet);
+ ods_unref (spreadsheet);
}
free (filename);
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));
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));
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