X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget-data.c;h=e3e6c5d43bd0d4a4b7818d88e2a81b2f02e3bd32;hb=b73c7309c2fff2b35f406d8e0e75be3dc3621396;hp=c3e842211dd95ac3bd06262cdeeab97cc0f84b38;hpb=332f2de0d9130b4746a30f473cbbdef481956fac;p=pspp diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index c3e842211d..e3e6c5d43b 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/data-io/get-data.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010, 2011 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 @@ -18,23 +18,23 @@ #include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/dataset.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/gnumeric-reader.h" +#include "data/psql-reader.h" +#include "data/settings.h" +#include "language/command.h" +#include "language/data-io/data-parser.h" +#include "language/data-io/data-reader.h" +#include "language/data-io/file-handle.h" +#include "language/data-io/placement-parser.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -122,7 +122,10 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) struct casereader *reader = psql_open_reader (&psql, &dict); if ( reader ) - proc_set_active_file (ds, reader, dict); + { + dataset_set_dict (ds, dict); + dataset_set_source (ds, reader); + } } ds_destroy (&psql.sql); @@ -153,7 +156,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) if (!lex_force_string (lexer)) goto error; - gri.file_name = ss_xstrdup (lex_tokss (lexer)); + gri.file_name = utf8_to_filename (lex_tokcstr (lexer)); lex_get (lexer); @@ -163,6 +166,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) { lex_match (lexer, T_EQUALS); gri.asw = lex_integer (lexer); + lex_get (lexer); } else if (lex_match_id (lexer, "SHEET")) { @@ -174,10 +178,13 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) gri.sheet_name = ss_xstrdup (lex_tokss (lexer)); gri.sheet_index = -1; + + lex_get (lexer); } else if (lex_match_id (lexer, "INDEX")) { gri.sheet_index = lex_integer (lexer); + lex_get (lexer); } else goto error; @@ -189,7 +196,6 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) if (lex_match_id (lexer, "FULL")) { gri.cell_range = NULL; - lex_put_back (lexer, T_ID); } else if (lex_match_id (lexer, "RANGE")) { @@ -197,6 +203,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) goto error; gri.cell_range = ss_xstrdup (lex_tokss (lexer)); + lex_get (lexer); } else goto error; @@ -215,14 +222,12 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) } else goto error; - lex_put_back (lexer, T_ID); } else { - printf ("Unknown data file type `%s'\n", lex_tokcstr (lexer)); + lex_error (lexer, NULL); goto error; } - lex_get (lexer); } { @@ -230,7 +235,10 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) struct casereader *reader = gnumeric_open_reader (&gri, &dict); if ( reader ) - proc_set_active_file (ds, reader, dict); + { + dataset_set_dict (ds, dict); + dataset_set_source (ds, reader); + } } free (gri.file_name); @@ -271,9 +279,10 @@ static int parse_get_txt (struct lexer *lexer, struct dataset *ds) { struct data_parser *parser = NULL; - struct dictionary *dict = dict_create (); + struct dictionary *dict = dict_create (get_default_encoding ()); struct file_handle *fh = NULL; struct dfm_reader *reader = NULL; + char *name = NULL; int record; enum data_parser_type type; @@ -284,7 +293,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) if (!lex_force_match_id (lexer, "FILE")) goto error; lex_force_match (lexer, T_EQUALS); - fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE); + fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE, NULL); if (fh == NULL) goto error; @@ -416,6 +425,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) if (!lex_force_string (lexer)) goto error; + /* XXX should support multibyte UTF-8 characters */ s = lex_tokss (lexer); if (ss_match_string (&s, ss_cstr ("\\t"))) ds_put_cstr (&hard_seps, "\t"); @@ -441,6 +451,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) if (!lex_force_string (lexer)) goto error; + /* XXX should support multibyte UTF-8 characters */ if (settings_get_syntax () == COMPATIBLE && ss_length (lex_tokss (lexer)) != 1) { @@ -465,15 +476,13 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) } lex_match (lexer, T_EQUALS); - record = 1; type = data_parser_get_type (parser); do { - char name[VAR_NAME_LEN + 1]; struct fmt_spec input, output; - int fc, lc; struct variable *v; + int fc, lc; while (type == DP_FIXED && lex_match (lexer, T_SLASH)) { @@ -500,9 +509,10 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) lex_get (lexer); } - if (!lex_force_id (lexer)) + if (!lex_force_id (lexer) + || !dict_id_is_valid (dict, lex_tokcstr (lexer), true)) goto error; - strcpy (name, lex_tokcstr (lexer)); + name = xstrdup (lex_tokcstr (lexer)); lex_get (lexer); if (type == DP_DELIMITED) @@ -539,6 +549,8 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) else data_parser_add_fixed_field (parser, &input, var_get_case_index (v), name, record, fc); + free (name); + name = NULL; } while (lex_token (lexer) != T_ENDCMD); @@ -554,5 +566,6 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) data_parser_destroy (parser); dict_destroy (dict); fh_unref (fh); + free (name); return CMD_CASCADING_FAILURE; }