projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppireVarView: Use g_realloc instead of xrealloc
[pspp]
/
src
/
language
/
dictionary
/
apply-dictionary.c
diff --git
a/src/language/dictionary/apply-dictionary.c
b/src/language/dictionary/apply-dictionary.c
index 7fdbdd472f8e463b7f5677ef23d15ba38b410360..d09f8a8721dfa889f4ce9853d4d274877b2e70f4 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, 2014, 2016
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,19
+50,19
@@
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
_and_decode (handle, NULL, &dict, NULL
);
fh_unref (handle);
fh_unref (handle);
- if (
dict == NULL
)
+ if (
!reader
)
return CMD_FAILURE;
casereader_destroy (reader);
for (i = 0; i < dict_get_var_cnt (dict); i++)
{
return CMD_FAILURE;
casereader_destroy (reader);
for (i = 0; i < dict_get_var_cnt (dict); i++)
{
- struct variable *s = dict_get_var (dict, i);
+
const
struct variable *s = dict_get_var (dict, i);
struct variable *t = dict_lookup_var (dataset_dict (ds),
var_get_name (s));
if (t == NULL)
struct variable *t = dict_lookup_var (dataset_dict (ds),
var_get_name (s));
if (t == NULL)
@@
-79,18
+79,14
@@
cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
continue;
}
continue;
}
- if (var_get_label (s))
- {
- const char *label = var_get_label (s);
- if (strcspn (label, " ") != strlen (label))
- var_set_label (t, label);
- }
+ if (var_has_label (s))
+ var_set_label (t, var_get_label (s));
if (var_has_value_labels (s))
{
const struct val_labs *value_labels = var_get_value_labels (s);
if (val_labs_can_set_width (value_labels, var_get_width (t)))
if (var_has_value_labels (s))
{
const struct val_labs *value_labels = var_get_value_labels (s);
if (val_labs_can_set_width (value_labels, var_get_width (t)))
- var_set_value_labels (
s
, value_labels);
+ var_set_value_labels (
t
, value_labels);
}
if (var_has_missing_values (s))
}
if (var_has_missing_values (s))
@@
-106,7
+102,7
@@
cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
var_set_write_format (t, var_get_write_format (s));
}
var_set_write_format (t, var_get_write_format (s));
}
- if (var_has_attributes (s))
+ if (var_has_attributes (s))
var_set_attributes (t, var_get_attributes (s));
}
var_set_attributes (t, var_get_attributes (s));
}
@@
-129,5
+125,7
@@
cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
dict_set_weight (dataset_dict (ds), new_weight);
}
dict_set_weight (dataset_dict (ds), new_weight);
}
- return lex_end_of_command (lexer);
+ dict_unref (dict);
+
+ return CMD_SUCCESS;
}
}