X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget-data.c;h=2bf419659d18e52ae99a91455c05dcd8a5b698df;hb=1b5c2d8fe129a5f8db76c42250a9c199deccb773;hp=7b1d2882a2c9a26646783f67464f1a5bfba5620b;hpb=ddf35b11f8525281dd9e524a5d322a80bf56a24f;p=pspp diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index 7b1d2882a2..2bf419659d 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/data-io/get-data.c @@ -1,5 +1,6 @@ /* 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 @@ -45,10 +46,32 @@ #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 *); @@ -57,10 +80,18 @@ int 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); @@ -81,38 +112,46 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds) 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)) + if ( gnm_read_support && 0 == strncasecmp (tok, "GNM", 3)) { - struct spreadsheet *spreadsheet = gnumeric_probe (filename); - reader = gnumeric_make_reader (spreadsheet, &sri, &opts); + struct spreadsheet *spreadsheet = gnumeric_probe (filename, true); + if (spreadsheet == NULL) + goto error; + reader = gnumeric_make_reader (spreadsheet, &opts); dict = spreadsheet->dict; + gnumeric_unref (spreadsheet); } - else if (0 == strncasecmp (tok, "ODS", 3)) + else if ( odf_read_support && 0 == strncasecmp (tok, "ODS", 3)) { - struct spreadsheet *spreadsheet = ods_probe (filename); - reader = ods_make_reader (spreadsheet, &sri, &opts); + struct spreadsheet *spreadsheet = ods_probe (filename, true); + if (spreadsheet == NULL) + goto error; + reader = ods_make_reader (spreadsheet, &opts); dict = spreadsheet->dict; + ods_unref (spreadsheet); } + free (filename); + if (reader) { dataset_set_dict (ds, dict); dataset_set_source (ds, reader); - destroy_spreadsheet_read_info (&sri, &opts); free (tok); + destroy_spreadsheet_read_info (&opts); return CMD_SUCCESS; } - destroy_spreadsheet_read_info (&sri, &opts); } else msg (SE, _("Unsupported TYPE %s."), tok); + error: + destroy_spreadsheet_read_info (&opts); free (tok); return CMD_FAILURE; } @@ -194,14 +233,14 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) } 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); @@ -222,7 +261,7 @@ parse_spreadsheet (struct lexer *lexer, char **filename, struct spreadsheet_read if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH")) { lex_match (lexer, T_EQUALS); - sri->asw = lex_integer (lexer); + opts->asw = lex_integer (lexer); lex_get (lexer); } else if (lex_match_id (lexer, "SHEET")) @@ -284,11 +323,11 @@ parse_spreadsheet (struct lexer *lexer, char **filename, struct spreadsheet_read 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 { @@ -307,7 +346,6 @@ parse_spreadsheet (struct lexer *lexer, char **filename, struct spreadsheet_read return true; error: - destroy_spreadsheet_read_info (sri, opts); return false; } @@ -361,6 +399,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_quote_escape (parser, true); data_parser_set_empty_line_has_field (parser, true); for (;;) @@ -404,7 +443,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) 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); @@ -442,7 +481,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) 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)); @@ -453,33 +492,22 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) 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)) { @@ -533,9 +561,6 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) 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 @@ -671,9 +696,8 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) 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); }