#include <stdlib.h>
-#include <data/gnumeric-reader.h>
-#include <data/psql-reader.h>
-
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.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/message.h>
-
-#include "xalloc.h"
+#include <string.h>
+
+#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"
+#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/cast.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+
+#include "gl/xalloc.h"
#include "gettext.h"
#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"))
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"))
+ {
+ return parse_get_txt (lexer, ds);
+ }
else if (lex_match_id (lexer, "PSQL"))
- return parse_get_psql (lexer, ds);
+ {
+ 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;
}
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);
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);
if (!lex_force_string (lexer))
goto error;
- gri.file_name = ss_xstrdup (lex_tokss (lexer));
+ sri->file_name = utf8_to_filename (lex_tokcstr (lexer));
lex_get (lexer);
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"))
{
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);
+ lex_get (lexer);
}
else
goto error;
if (lex_match_id (lexer, "FULL"))
{
- gri.cell_range = NULL;
- lex_put_back (lexer, T_ID);
+ 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;
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;
- 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);
}
- {
- struct dictionary *dict = NULL;
- struct casereader *reader = gnumeric_open_reader (&gri, &dict);
-
- if ( reader )
- proc_set_active_file (ds, reader, dict);
- }
-
- 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)
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;
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;
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)
}
else
{
- lex_error (lexer, _("expecting %s or %s"), "LINE", "VARIABLES");
+ lex_error_expecting (lexer, "LINE", "VARIABLES", NULL_SENTINEL);
goto error;
}
}
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");
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)
{
break;
else
{
- lex_error (lexer, _("expecting %s"), "VARIABLES");
+ lex_error_expecting (lexer, "VARIABLES", NULL_SENTINEL);
goto error;
}
}
lex_get (lexer);
}
- if (!lex_force_id (lexer))
+ if (!lex_force_id (lexer)
+ || !dict_id_is_valid (dict, lex_tokcstr (lexer), true))
goto error;
name = xstrdup (lex_tokcstr (lexer));
lex_get (lexer);
if (!parse_format_specifier (lexer, &input)
|| !fmt_check_input (&input))
goto error;
+
+ output = fmt_for_output_from_input (&input);
}
else
{
+ char fmt_type_name[FMT_TYPE_LEN_MAX + 1];
+ enum fmt_type fmt_type;
+ int w, d;
+
if (!parse_column_range (lexer, 0, &fc, &lc, NULL))
goto error;
- if (!parse_format_specifier_name (lexer, &input.type))
+
+ /* Accept a format (e.g. F8.2) or just a type name (e.g. DOLLAR). */
+ if (!parse_abstract_format_specifier (lexer, fmt_type_name, &w, &d))
goto error;
+ if (!fmt_from_name (fmt_type_name, &fmt_type))
+ {
+ 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)
+ {
+ output.type = fmt_type;
+ output.w = w;
+ output.d = d;
+ if (!fmt_check_output (&output))
+ goto error;
+ }
+ else
+ output = fmt_for_output_from_input (&input);
}
- output = fmt_for_output_from_input (&input);
v = dict_create_var (dict, name, fmt_var_width (&input));
if (v == NULL)
free (name);
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);
+}
projects / pspp / blobdiff