projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GET DATA/TYPE=TXT: Remove ESCAPE subcommand and make its behavior default.
[pspp]
/
src
/
language
/
data-io
/
get-data.c
diff --git
a/src/language/data-io/get-data.c
b/src/language/data-io/get-data.c
index 321bd887ea3690c91e7b0a916b7cd24f8b10443a..01817179b87f7ed3a5c9f9c28fb47bd166b2546b 100644
(file)
--- a/
src/language/data-io/get-data.c
+++ b/
src/language/data-io/get-data.c
@@
-1,6
+1,6
@@
/* PSPP - a program for statistical analysis.
Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012,
/* 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
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
@@
-46,6
+46,19
@@
#define _(msgid) gettext (msgid)
#define N_(msgid) (msgid)
#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);
static bool parse_spreadsheet (struct lexer *lexer, char **filename,
struct spreadsheet_read_options *opts);
@@
-94,7
+107,7
@@
cmd_get_data (struct lexer *lexer, struct dataset *ds)
if (!parse_spreadsheet (lexer, &filename, &opts))
goto error;
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)
{
struct spreadsheet *spreadsheet = gnumeric_probe (filename, true);
if (spreadsheet == NULL)
@@
-103,7
+116,7
@@
cmd_get_data (struct lexer *lexer, struct dataset *ds)
dict = spreadsheet->dict;
gnumeric_destroy (spreadsheet);
}
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)
{
struct spreadsheet *spreadsheet = ods_probe (filename, true);
if (spreadsheet == NULL)
@@
-377,6
+390,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
data_parser_set_type (parser, DP_DELIMITED);
data_parser_set_span (parser, false);
data_parser_set_quotes (parser, ss_empty ());
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 (;;)
data_parser_set_empty_line_has_field (parser, true);
for (;;)
@@
-420,7
+434,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
goto error;
if (lex_integer (lexer) < 1)
{
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;
}
data_parser_set_skip (parser, lex_integer (lexer) - 1);
@@
-458,7
+472,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
goto error;
if (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;
}
data_parser_set_records (parser, lex_integer (lexer));
@@
-478,7
+492,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
goto error;
if (lex_integer (lexer) < 1)
{
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;
}
data_parser_set_case_limit (parser, lex_integer (lexer));
@@
-490,7
+504,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
goto error;
if (lex_integer (lexer) < 1 || lex_integer (lexer) > 100)
{
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));
goto error;
}
data_parser_set_case_percent (parser, lex_integer (lexer));
@@
-549,9
+563,6
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
data_parser_set_quotes (parser, lex_tokss (lexer));
lex_get (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
else if (lex_match_id (lexer, "VARIABLES"))
break;
else