projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
language
/
dictionary
/
apply-dictionary.c
diff --git
a/src/language/dictionary/apply-dictionary.c
b/src/language/dictionary/apply-dictionary.c
index 36877302afc80dfa878685b211b9a0dcaa4f70f5..8531ba56d2d257d30e3cc085ab42fafa91bca19c 100644
(file)
--- a/
src/language/dictionary/apply-dictionary.c
+++ b/
src/language/dictionary/apply-dictionary.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011
, 2012
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
@@
-20,10
+20,10
@@
#include "data/any-reader.h"
#include "data/casereader.h"
#include "data/any-reader.h"
#include "data/casereader.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/file-handle-def.h"
#include "data/missing-values.h"
#include "data/dictionary.h"
#include "data/file-handle-def.h"
#include "data/missing-values.h"
-#include "data/procedure.h"
#include "data/value-labels.h"
#include "data/variable.h"
#include "language/command.h"
#include "data/value-labels.h"
#include "data/variable.h"
#include "language/command.h"
@@
-50,10
+50,10
@@
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;
if (!handle)
return CMD_FAILURE;
- reader = any_reader_open (handle, &dict);
+ reader = any_reader_open (handle,
NULL,
&dict);
fh_unref (handle);
if (dict == NULL)
return CMD_FAILURE;
fh_unref (handle);
if (dict == NULL)
return CMD_FAILURE;
@@
-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))
{