X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget-data.c;h=0c60bd3d63bb2c84104a28442e331499a088c30d;hb=2a76184b55a8c229adc0b31d3436d29076de0ef8;hp=9d1e28100e32f5beb8e2a52401c80deacd7b1aba;hpb=3de625dbfb973ef841341b14a0db7e0b2abec83f;p=pspp diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index 9d1e28100e..0c60bd3d63 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/data-io/get-data.c @@ -46,28 +46,6 @@ #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; -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); @@ -81,14 +59,15 @@ 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 (lexer, T_SLASH)) + goto error; if (!lex_force_match_id (lexer, "TYPE")) goto error; @@ -100,7 +79,7 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds) if (s) tok = strdup (s); - + if (lex_match_id (lexer, "TXT")) { free (tok); @@ -111,7 +90,7 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds) free (tok); return parse_get_psql (lexer, ds); } - else if (lex_match_id (lexer, "GNM") || + else if (lex_match_id (lexer, "GNM") || lex_match_id (lexer, "ODS")) { char *filename = NULL; @@ -119,14 +98,18 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds) goto error; struct spreadsheet *spreadsheet = NULL; - if ( gnm_read_support && 0 == strncasecmp (tok, "GNM", 3)) + if (0 == strncasecmp (tok, "GNM", 3)) spreadsheet = gnumeric_probe (filename, true); - else if ( odf_read_support && 0 == strncasecmp (tok, "ODS", 3)) + else if (0 == strncasecmp (tok, "ODS", 3)) spreadsheet = ods_probe (filename, true); - free (filename); if (spreadsheet == NULL) - goto error; + { + msg (SE, _("error reading file `%s'"), filename); + free (filename); + goto error; + } + free (filename); struct casereader *reader = spreadsheet_make_reader (spreadsheet, &opts); if (reader) @@ -160,12 +143,14 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) psql.bsize = -1; ds_init_empty (&psql.sql); - lex_force_match (lexer, T_SLASH); + if (! lex_force_match (lexer, T_SLASH)) + goto error; if (!lex_force_match_id (lexer, "CONNECT")) goto error; - lex_force_match (lexer, T_EQUALS); + if (! lex_force_match (lexer, T_EQUALS)) + goto error; if (!lex_force_string (lexer)) goto error; @@ -174,34 +159,34 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) lex_get (lexer); - while (lex_match (lexer, T_SLASH) ) + while (lex_match (lexer, T_SLASH)) { - if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH")) + if (lex_match_id (lexer, "ASSUMEDSTRWIDTH")) { lex_match (lexer, T_EQUALS); - if (lex_force_int (lexer)) + if (lex_force_int_range (lexer, "ASSUMEDSTRWIDTH", 1, 32767)) { psql.str_width = lex_integer (lexer); lex_get (lexer); } } - else if ( lex_match_id (lexer, "BSIZE")) + else if (lex_match_id (lexer, "BSIZE")) { lex_match (lexer, T_EQUALS); - if (lex_force_int (lexer)) + if (lex_force_int_range (lexer, "BSIZE", 1, INT_MAX)) { psql.bsize = lex_integer (lexer); lex_get (lexer); } } - else if ( lex_match_id (lexer, "UNENCRYPTED")) + else if (lex_match_id (lexer, "UNENCRYPTED")) { psql.allow_clear = true; } else if (lex_match_id (lexer, "SQL")) { lex_match (lexer, T_EQUALS); - if ( ! lex_force_string (lexer) ) + if (! lex_force_string (lexer)) goto error; ds_put_substring (&psql.sql, lex_tokss (lexer)); @@ -212,7 +197,7 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) struct dictionary *dict = NULL; struct casereader *reader = psql_open_reader (&psql, &dict); - if ( reader ) + if (reader) { dataset_set_dict (ds, dict); dataset_set_source (ds, reader); @@ -233,7 +218,7 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) } static bool -parse_spreadsheet (struct lexer *lexer, char **filename, +parse_spreadsheet (struct lexer *lexer, char **filename, struct spreadsheet_read_options *opts) { opts->sheet_index = 1; @@ -242,12 +227,14 @@ parse_spreadsheet (struct lexer *lexer, char **filename, opts->read_names = true; opts->asw = -1; - lex_force_match (lexer, T_SLASH); + if (! lex_force_match (lexer, T_SLASH)) + goto error; if (!lex_force_match_id (lexer, "FILE")) goto error; - lex_force_match (lexer, T_EQUALS); + if (! lex_force_match (lexer, T_EQUALS)) + goto error; if (!lex_force_string (lexer)) goto error; @@ -256,12 +243,12 @@ parse_spreadsheet (struct lexer *lexer, char **filename, lex_get (lexer); - while (lex_match (lexer, T_SLASH) ) + while (lex_match (lexer, T_SLASH)) { - if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH")) + if (lex_match_id (lexer, "ASSUMEDSTRWIDTH")) { lex_match (lexer, T_EQUALS); - if (lex_force_int (lexer)) + if (lex_force_int_range (lexer, "ASSUMEDSTRWIDTH", 1, 32767)) { opts->asw = lex_integer (lexer); lex_get (lexer); @@ -272,7 +259,7 @@ parse_spreadsheet (struct lexer *lexer, char **filename, lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "NAME")) { - if ( ! lex_force_string (lexer) ) + if (! lex_force_string (lexer)) goto error; opts->sheet_name = ss_xstrdup (lex_tokss (lexer)); @@ -282,15 +269,9 @@ parse_spreadsheet (struct lexer *lexer, char **filename, } else if (lex_match_id (lexer, "INDEX")) { - if (!lex_force_int (lexer)) + if (!lex_force_int_range (lexer, "INDEX", 1, INT_MAX)) goto error; - opts->sheet_index = lex_integer (lexer); - if (opts->sheet_index <= 0) - { - msg (SE, _("The sheet index must be greater than or equal to 1")); - goto error; - } lex_get (lexer); } else @@ -310,7 +291,7 @@ parse_spreadsheet (struct lexer *lexer, char **filename, } else if (lex_match_id (lexer, "RANGE")) { - if ( ! lex_force_string (lexer) ) + if (! lex_force_string (lexer)) goto error; opts->cell_range = ss_xstrdup (lex_tokss (lexer)); @@ -327,7 +308,7 @@ parse_spreadsheet (struct lexer *lexer, char **filename, { lex_match (lexer, T_EQUALS); - if ( lex_match_id (lexer, "ON")) + if (lex_match_id (lexer, "ON")) { opts->read_names = true; } @@ -391,16 +372,18 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) enum data_parser_type type; bool has_type; - lex_force_match (lexer, T_SLASH); + if (! lex_force_match (lexer, T_SLASH)) + goto error; if (!lex_force_match_id (lexer, "FILE")) goto error; - lex_force_match (lexer, T_EQUALS); + if (! lex_force_match (lexer, T_EQUALS)) + goto error; fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE, NULL); if (fh == NULL) goto error; - parser = data_parser_create (dict); + parser = data_parser_create (); has_type = false; data_parser_set_type (parser, DP_DELIMITED); data_parser_set_span (parser, false); @@ -436,7 +419,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) DP_DELIMITED, &has_type); else { - lex_error_expecting (lexer, "FIXED", "DELIMITED", NULL_SENTINEL); + lex_error_expecting (lexer, "FIXED", "DELIMITED"); goto error; } if (!ok) @@ -445,13 +428,8 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) else if (lex_match_id (lexer, "FIRSTCASE")) { lex_match (lexer, T_EQUALS); - if (!lex_force_int (lexer)) + if (!lex_force_int_range (lexer, "FIRSTCASE", 1, INT_MAX)) goto error; - if (lex_integer (lexer) < 1) - { - msg (SE, _("Value of %s must be 1 or greater."), "FIRSTCASE"); - goto error; - } data_parser_set_skip (parser, lex_integer (lexer) - 1); lex_get (lexer); } @@ -474,7 +452,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) } else { - lex_error_expecting (lexer, "LINE", "VARIABLES", NULL_SENTINEL); + lex_error_expecting (lexer, "LINE", "VARIABLES"); goto error; } } @@ -483,13 +461,8 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) if (!set_type (parser, "FIXCASE", DP_FIXED, &has_type)) goto error; lex_match (lexer, T_EQUALS); - if (!lex_force_int (lexer)) + if (!lex_force_int_range (lexer, "FIXCASE", 1, INT_MAX)) goto error; - if (lex_integer (lexer) < 1) - { - msg (SE, _("Value of %s must be 1 or greater."), "FIXCASE"); - goto error; - } data_parser_set_records (parser, lex_integer (lexer)); lex_get (lexer); } @@ -571,7 +544,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) break; else { - lex_error_expecting (lexer, "VARIABLES", NULL_SENTINEL); + lex_error_expecting (lexer, "VARIABLES"); goto error; } } @@ -587,48 +560,42 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) while (type == DP_FIXED && lex_match (lexer, T_SLASH)) { - if (!lex_force_int (lexer)) + if (!lex_force_int_range (lexer, NULL, record, + data_parser_get_records (parser))) goto error; - if (lex_integer (lexer) < record) - { - msg (SE, _("The record number specified, %ld, is at or " - "before the previous record, %d. Data " - "fields must be listed in order of " - "increasing record number."), - lex_integer (lexer), record); - goto error; - } - if (lex_integer (lexer) > data_parser_get_records (parser)) - { - msg (SE, _("The record number specified, %ld, exceeds " - "the number of records per case specified " - "on FIXCASE, %d."), - lex_integer (lexer), data_parser_get_records (parser)); - goto error; - } record = lex_integer (lexer); lex_get (lexer); } + const char * tstr = lex_tokcstr (lexer); + if (tstr == NULL) + { + lex_error (lexer, NULL); + goto error; + } + name = xstrdup (tstr); if (!lex_force_id (lexer) - || !dict_id_is_valid (dict, lex_tokcstr (lexer), true)) - goto error; - name = xstrdup (lex_tokcstr (lexer)); + || !dict_id_is_valid (dict, name, true)) + { + goto error; + } lex_get (lexer); - if (type == DP_DELIMITED) { if (!parse_format_specifier (lexer, &input) - || !fmt_check_input (&input)) - goto error; - - output = fmt_for_output_from_input (&input); + || !fmt_check_input (&input)) + { + goto error; + } + output = fmt_for_output_from_input (&input, + settings_get_fmt_settings ()); } else { char fmt_type_name[FMT_TYPE_LEN_MAX + 1]; enum fmt_type fmt_type; - int w, d; + uint16_t w; + uint8_t d; if (!parse_column_range (lexer, 0, &fc, &lc, NULL)) goto error; @@ -641,14 +608,12 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) msg (SE, _("Unknown format type `%s'."), fmt_type_name); goto error; } - /* Compose input format. */ input.type = fmt_type; input.w = lc - fc + 1; input.d = 0; if (!fmt_check_input (&input)) goto error; - /* Compose output format. */ if (w != 0) { @@ -659,9 +624,9 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) goto error; } else - output = fmt_for_output_from_input (&input); + output = fmt_for_output_from_input (&input, + settings_get_fmt_settings ()); } - v = dict_create_var (dict, name, fmt_var_width (&input)); if (v == NULL) { @@ -669,7 +634,6 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) goto error; } var_set_both_formats (v, &output); - if (type == DP_DELIMITED) data_parser_add_delimited_field (parser, &input, var_get_case_index (v), @@ -686,14 +650,14 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) if (reader == NULL) goto error; - data_parser_make_active_file (parser, ds, reader, dict); + data_parser_make_active_file (parser, ds, reader, dict, NULL, NULL); fh_unref (fh); free (encoding); return CMD_SUCCESS; error: data_parser_destroy (parser); - dict_destroy (dict); + dict_unref (dict); fh_unref (fh); free (name); free (encoding); @@ -701,7 +665,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) } -static void +static void destroy_spreadsheet_read_info (struct spreadsheet_read_options *opts) { free (opts->cell_range);