projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fewer memory leaks
[pspp]
/
src
/
language
/
data-io
/
get-data.c
diff --git
a/src/language/data-io/get-data.c
b/src/language/data-io/get-data.c
index 8f75272e2d0648c246734ce63d50e87715e9247e..daec18f41da340c9d0e5b9c882eae4e3c2fbc53d 100644
(file)
--- 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.
/* 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 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
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,10
@@
#define _(msgid) gettext (msgid)
#define N_(msgid) (msgid)
#define _(msgid) gettext (msgid)
#define N_(msgid) (msgid)
-static bool parse_spreadsheet (struct lexer *lexer,
struct spreadsheet_read_info *sri,
+static bool parse_spreadsheet (struct lexer *lexer,
char **filename,
struct spreadsheet_read_options *opts);
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 *);
static int parse_get_txt (struct lexer *lexer, struct dataset *);
static int parse_get_psql (struct lexer *lexer, struct dataset *);
@@
-56,11
+57,12
@@
static int parse_get_psql (struct lexer *lexer, struct dataset *);
int
cmd_get_data (struct lexer *lexer, struct dataset *ds)
{
int
cmd_get_data (struct lexer *lexer, struct dataset *ds)
{
+ struct spreadsheet_read_options opts;
char *tok = NULL;
lex_force_match (lexer, T_SLASH);
if (!lex_force_match_id (lexer, "TYPE"))
char *tok = NULL;
lex_force_match (lexer, T_SLASH);
if (!lex_force_match_id (lexer, "TYPE"))
-
return CMD_FAILURE
;
+
goto error
;
lex_force_match (lexer, T_EQUALS);
lex_force_match (lexer, T_EQUALS);
@@
-78,32
+80,48
@@
cmd_get_data (struct lexer *lexer, struct dataset *ds)
else if (lex_match_id (lexer, "GNM") ||
lex_match_id (lexer, "ODS"))
{
else if (lex_match_id (lexer, "GNM") ||
lex_match_id (lexer, "ODS"))
{
+ char *filename = NULL;
struct casereader *reader = NULL;
struct dictionary *dict = NULL;
struct casereader *reader = NULL;
struct dictionary *dict = NULL;
- struct spreadsheet_read_info sri;
- struct spreadsheet_read_options opts;
- if (!parse_spreadsheet (lexer, &sri, &opts))
+
+ if (!parse_spreadsheet (lexer, &filename, &opts))
goto error;
if ( 0 == strncasecmp (tok, "GNM", 3))
goto error;
if ( 0 == strncasecmp (tok, "GNM", 3))
- reader = gnumeric_open_reader (&sri, &opts, &dict);
+ {
+ struct spreadsheet *spreadsheet = gnumeric_probe (filename, true);
+ if (spreadsheet == NULL)
+ goto error;
+ reader = gnumeric_make_reader (spreadsheet, &opts);
+ dict = spreadsheet->dict;
+ }
else if (0 == strncasecmp (tok, "ODS", 3))
else if (0 == strncasecmp (tok, "ODS", 3))
- reader = ods_open_reader (&sri, &opts, &dict);
+ {
+ struct spreadsheet *spreadsheet = ods_probe (filename, true);
+ if (spreadsheet == NULL)
+ goto error;
+ reader = ods_make_reader (spreadsheet, &opts);
+ dict = spreadsheet->dict;
+ ods_destroy (spreadsheet);
+ }
+
+ free (filename);
if (reader)
{
dataset_set_dict (ds, dict);
dataset_set_source (ds, reader);
if (reader)
{
dataset_set_dict (ds, dict);
dataset_set_source (ds, reader);
- destroy_spreadsheet_read_info (&sri, &opts);
free (tok);
free (tok);
+ destroy_spreadsheet_read_info (&opts);
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}
- destroy_spreadsheet_read_info (&sri, &opts);
}
else
msg (SE, _("Unsupported TYPE %s."), tok);
}
else
msg (SE, _("Unsupported TYPE %s."), tok);
+
error:
error:
+ destroy_spreadsheet_read_info (&opts);
free (tok);
return CMD_FAILURE;
}
free (tok);
return CMD_FAILURE;
}
@@
-185,15
+203,14
@@
parse_get_psql (struct lexer *lexer, struct dataset *ds)
}
static bool
}
static bool
-parse_spreadsheet (struct lexer *lexer,
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;
struct spreadsheet_read_options *opts)
{
opts->sheet_index = 1;
opts->sheet_name = NULL;
opts->cell_range = NULL;
- sri->read_names = true;
- sri->asw = -1;
- sri->file_name = NULL;
+ opts->read_names = true;
+ opts->asw = -1;
lex_force_match (lexer, T_SLASH);
lex_force_match (lexer, T_SLASH);
@@
-205,7
+222,7
@@
parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri,
if (!lex_force_string (lexer))
goto error;
if (!lex_force_string (lexer))
goto error;
-
sri->file_name
= utf8_to_filename (lex_tokcstr (lexer));
+
*filename
= utf8_to_filename (lex_tokcstr (lexer));
lex_get (lexer);
lex_get (lexer);
@@
-214,7
+231,7
@@
parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri,
if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH"))
{
lex_match (lexer, T_EQUALS);
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"))
lex_get (lexer);
}
else if (lex_match_id (lexer, "SHEET"))
@@
-276,11
+293,11
@@
parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri,
if ( lex_match_id (lexer, "ON"))
{
if ( lex_match_id (lexer, "ON"))
{
-
sri
->read_names = true;
+
opts
->read_names = true;
}
else if (lex_match_id (lexer, "OFF"))
{
}
else if (lex_match_id (lexer, "OFF"))
{
-
sri
->read_names = false;
+
opts
->read_names = false;
}
else
{
}
else
{
@@
-299,7
+316,6
@@
parse_spreadsheet (struct lexer *lexer, struct spreadsheet_read_info *sri,
return true;
error:
return true;
error:
- destroy_spreadsheet_read_info (sri, opts);
return false;
}
return false;
}
@@
-663,10
+679,8
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
static void
static void
-destroy_spreadsheet_read_info (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->cell_range);
- free (
sri->file
_name);
+ free (
opts->sheet
_name);
}
}