X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget-data.c;h=ac2944caee4974197333c1467c92f9c2966ebc20;hb=4380b231f2f788eb799bde6164183d6990438350;hp=47b65b445adfc44ffa15e9b72c9738703fc687a0;hpb=e87acf42e694cfae68040f62342becc7be3909a7;p=pspp diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index 47b65b445a..ac2944caee 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, 2011 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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,10 +18,14 @@ #include +#include + #include "data/dataset.h" #include "data/dictionary.h" #include "data/format.h" #include "data/gnumeric-reader.h" +#include "data/ods-reader.h" +#include "data/spreadsheet-reader.h" #include "data/psql-reader.h" #include "data/settings.h" #include "language/command.h" @@ -31,6 +35,7 @@ #include "language/data-io/placement-parser.h" #include "language/lexer/format-parser.h" #include "language/lexer/lexer.h" +#include "libpspp/cast.h" #include "libpspp/i18n.h" #include "libpspp/message.h" @@ -40,13 +45,16 @@ #define _(msgid) gettext (msgid) #define N_(msgid) (msgid) -static int parse_get_gnm (struct lexer *lexer, struct dataset *); +static struct spreadsheet_read_info *parse_spreadsheet (struct lexer *lexer); +static void destroy_spreadsheet_read_info (struct spreadsheet_read_info *); + static int parse_get_txt (struct lexer *lexer, struct dataset *); static int parse_get_psql (struct lexer *lexer, struct dataset *); int cmd_get_data (struct lexer *lexer, struct dataset *ds) { + char *tok = NULL; lex_force_match (lexer, T_SLASH); if (!lex_force_match_id (lexer, "TYPE")) @@ -54,14 +62,46 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds) lex_force_match (lexer, T_EQUALS); - if (lex_match_id (lexer, "GNM")) - return parse_get_gnm (lexer, ds); - else if (lex_match_id (lexer, "TXT")) - return parse_get_txt (lexer, ds); + tok = strdup (lex_tokcstr (lexer)); + if (lex_match_id (lexer, "TXT")) + { + free (tok); + return parse_get_txt (lexer, ds); + } else if (lex_match_id (lexer, "PSQL")) - return parse_get_psql (lexer, ds); + { + free (tok); + return parse_get_psql (lexer, ds); + } + else if (lex_match_id (lexer, "GNM") || + lex_match_id (lexer, "ODS")) + { + struct casereader *reader = NULL; + struct dictionary *dict = NULL; + struct spreadsheet_read_info *sri = parse_spreadsheet (lexer); + if (NULL == sri) + goto error; + + if ( 0 == strncasecmp (tok, "GNM", 3)) + reader = gnumeric_open_reader (sri, &dict); + else if (0 == strncasecmp (tok, "ODS", 3)) + reader = ods_open_reader (sri, &dict); + + if (reader) + { + dataset_set_dict (ds, dict); + dataset_set_source (ds, reader); + destroy_spreadsheet_read_info (sri); + free (tok); + return CMD_SUCCESS; + } + destroy_spreadsheet_read_info (sri); + } + else + msg (SE, _("Unsupported TYPE %s."), tok); - msg (SE, _("Unsupported TYPE %s."), lex_tokcstr (lexer)); + error: + free (tok); return CMD_FAILURE; } @@ -141,10 +181,13 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) return CMD_FAILURE; } -static int -parse_get_gnm (struct lexer *lexer, struct dataset *ds) +static struct spreadsheet_read_info * +parse_spreadsheet (struct lexer *lexer) { - struct gnumeric_read_info gri = {NULL, NULL, NULL, 1, true, -1}; + struct spreadsheet_read_info *sri = xzalloc (sizeof *sri); + sri->sheet_index = 1; + sri->read_names = true; + sri->asw = -1; lex_force_match (lexer, T_SLASH); @@ -156,7 +199,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) if (!lex_force_string (lexer)) goto error; - gri.file_name = utf8_to_filename (lex_tokcstr (lexer)); + sri->file_name = utf8_to_filename (lex_tokcstr (lexer)); lex_get (lexer); @@ -165,7 +208,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH")) { lex_match (lexer, T_EQUALS); - gri.asw = lex_integer (lexer); + sri->asw = lex_integer (lexer); lex_get (lexer); } else if (lex_match_id (lexer, "SHEET")) @@ -176,18 +219,27 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) if ( ! lex_force_string (lexer) ) goto error; - gri.sheet_name = ss_xstrdup (lex_tokss (lexer)); - gri.sheet_index = -1; + sri->sheet_name = ss_xstrdup (lex_tokss (lexer)); + sri->sheet_index = -1; lex_get (lexer); } else if (lex_match_id (lexer, "INDEX")) { - gri.sheet_index = lex_integer (lexer); + sri->sheet_index = lex_integer (lexer); + if (sri->sheet_index <= 0) + { + msg (SE, _("The sheet index must be greater than or equal to 1")); + goto error; + } lex_get (lexer); } else - goto error; + { + msg (SE, _("%s must be followed by either \"%s\" or \"%s\"."), + "/SHEET", "NAME", "INDEX"); + goto error; + } } else if (lex_match_id (lexer, "CELLRANGE")) { @@ -195,18 +247,22 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) if (lex_match_id (lexer, "FULL")) { - gri.cell_range = NULL; + sri->cell_range = NULL; } else if (lex_match_id (lexer, "RANGE")) { if ( ! lex_force_string (lexer) ) goto error; - gri.cell_range = ss_xstrdup (lex_tokss (lexer)); + sri->cell_range = ss_xstrdup (lex_tokss (lexer)); lex_get (lexer); } else - goto error; + { + msg (SE, _("%s must be followed by either \"%s\" or \"%s\"."), + "/CELLRANGE", "FULL", "RANGE"); + goto error; + } } else if (lex_match_id (lexer, "READNAMES")) { @@ -214,14 +270,18 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) if ( lex_match_id (lexer, "ON")) { - gri.read_names = true; + sri->read_names = true; } else if (lex_match_id (lexer, "OFF")) { - gri.read_names = false; + sri->read_names = false; } else - goto error; + { + msg (SE, _("%s must be followed by either \"%s\" or \"%s\"."), + "/READNAMES", "ON", "OFF"); + goto error; + } } else { @@ -230,30 +290,14 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) } } - { - struct dictionary *dict = NULL; - struct casereader *reader = gnumeric_open_reader (&gri, &dict); - - if ( reader ) - { - dataset_set_dict (ds, dict); - dataset_set_source (ds, reader); - } - } - - free (gri.file_name); - free (gri.sheet_name); - free (gri.cell_range); - return CMD_SUCCESS; + return sri; error: - - free (gri.file_name); - free (gri.sheet_name); - free (gri.cell_range); - return CMD_FAILURE; + destroy_spreadsheet_read_info (sri); + return NULL; } + static bool set_type (struct data_parser *parser, const char *subcommand, enum data_parser_type type, bool *has_type) @@ -282,6 +326,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) struct dictionary *dict = dict_create (get_default_encoding ()); struct file_handle *fh = NULL; struct dfm_reader *reader = NULL; + char *encoding = NULL; char *name = NULL; int record; @@ -309,7 +354,18 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) if (!lex_force_match (lexer, T_SLASH)) goto error; - if (lex_match_id (lexer, "ARRANGEMENT")) + if (lex_match_id (lexer, "ENCODING")) + { + lex_match (lexer, T_EQUALS); + if (!lex_force_string (lexer)) + goto error; + + free (encoding); + encoding = ss_xstrdup (lex_tokss (lexer)); + + lex_get (lexer); + } + else if (lex_match_id (lexer, "ARRANGEMENT")) { bool ok; @@ -321,7 +377,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) DP_DELIMITED, &has_type); else { - lex_error (lexer, _("expecting %s or %s"), "FIXED", "DELIMITED"); + lex_error_expecting (lexer, "FIXED", "DELIMITED", NULL_SENTINEL); goto error; } if (!ok) @@ -359,7 +415,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) } else { - lex_error (lexer, _("expecting %s or %s"), "LINE", "VARIABLES"); + lex_error_expecting (lexer, "LINE", "VARIABLES", NULL_SENTINEL); goto error; } } @@ -470,7 +526,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) break; else { - lex_error (lexer, _("expecting %s"), "VARIABLES"); + lex_error_expecting (lexer, "VARIABLES", NULL_SENTINEL); goto error; } } @@ -581,12 +637,13 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) } while (lex_token (lexer) != T_ENDCMD); - reader = dfm_open_reader (fh, lexer); + reader = dfm_open_reader (fh, lexer, encoding); if (reader == NULL) goto error; data_parser_make_active_file (parser, ds, reader, dict); fh_unref (fh); + free (encoding); return CMD_SUCCESS; error: @@ -594,5 +651,19 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) dict_destroy (dict); fh_unref (fh); free (name); + free (encoding); return CMD_CASCADING_FAILURE; } + + +static void +destroy_spreadsheet_read_info (struct spreadsheet_read_info *sri) +{ + if ( NULL == sri) + return; + + free (sri->sheet_name); + free (sri->cell_range); + free (sri->file_name); + free (sri); +}