projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a summary introduction to INSTALL, to try to make it less frightening to inexpe...
[pspp]
/
src
/
language
/
dictionary
/
apply-dictionary.c
diff --git
a/src/language/dictionary/apply-dictionary.c
b/src/language/dictionary/apply-dictionary.c
index 96b77dc0133183bdbcb3cc359c2d656e4edf9c89..c2de9318ae81b13462c940aae839a580f886c2d4 100644
(file)
--- a/
src/language/dictionary/apply-dictionary.c
+++ b/
src/language/dictionary/apply-dictionary.c
@@
-50,7
+50,7
@@
cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
lex_match_id (lexer, "FROM");
lex_match (lexer, T_EQUALS);
lex_match_id (lexer, "FROM");
lex_match (lexer, T_EQUALS);
- handle = fh_parse (lexer, FH_REF_FILE
| FH_REF_SCRATCH
);
+ handle = fh_parse (lexer, FH_REF_FILE
, dataset_session (ds)
);
if (!handle)
return CMD_FAILURE;
reader = any_reader_open (handle, &dict);
if (!handle)
return CMD_FAILURE;
reader = any_reader_open (handle, &dict);
@@
-80,8
+80,7
@@
cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
}
if (var_has_label (s))
}
if (var_has_label (s))
- var_set_label (t, var_get_label (s),
- dict_get_encoding (dataset_dict (ds)), false);
+ var_set_label (t, var_get_label (s), false);
if (var_has_value_labels (s))
{
if (var_has_value_labels (s))
{