projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use %zu, not %d, to format a size_t.
[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 07000eb2041aa1a9870c38d8d7ea42826292d024..d7927527eba98cba9fb43f34169f99a19e4d8d16 100644
(file)
--- a/
src/language/data-io/get-data.c
+++ b/
src/language/data-io/get-data.c
@@
-122,7
+122,10
@@
parse_get_psql (struct lexer *lexer, struct dataset *ds)
struct casereader *reader = psql_open_reader (&psql, &dict);
if ( reader )
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);
}
ds_destroy (&psql.sql);
@@
-232,7
+235,10
@@
parse_get_gnm (struct lexer *lexer, struct dataset *ds)
struct casereader *reader = gnumeric_open_reader (&gri, &dict);
if ( reader )
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);
}
free (gri.file_name);
@@
-273,7
+279,7
@@
static int
parse_get_txt (struct lexer *lexer, struct dataset *ds)
{
struct data_parser *parser = NULL;
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;
struct file_handle *fh = NULL;
struct dfm_reader *reader = NULL;
char *name = NULL;