X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget.c;h=0e542ef0d28dc50b08ea97bd780424da5aede1d1;hb=724be9e4720784aafeac395b3f6df47a89fc5e07;hp=aa2b91fe6a92d3a8259c6475c597869c007ca12b;hpb=81579d9e9f994fb2908f50af41c3eb033d216e58;p=pspp-builds.git diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c index aa2b91fe..0e542ef0 100644 --- a/src/language/data-io/get.c +++ b/src/language/data-io/get.c @@ -22,9 +22,9 @@ #include "data/case-map.h" #include "data/case.h" #include "data/casereader.h" +#include "data/dataset.h" #include "data/dictionary.h" #include "data/por-file-writer.h" -#include "data/procedure.h" #include "language/command.h" #include "language/data-io/file-handle.h" #include "language/data-io/trim.h" @@ -82,7 +82,7 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command lex_match (lexer, T_EQUALS); fh_unref (fh); - fh = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH); + fh = fh_parse (lexer, FH_REF_FILE, NULL); if (fh == NULL) goto error; } @@ -128,7 +128,8 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command if (map != NULL) reader = case_map_create_input_translator (map, reader); - proc_set_active_file (ds, reader, dict); + dataset_set_dict (ds, dict); + dataset_set_source (ds, reader); fh_unref (fh); return CMD_SUCCESS;