X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fapply-dictionary.c;h=3eb29e7e35c93c8dbcf43026f4621185a88e3bd1;hb=c41cd1fefc98bb4abed33754276d93db9ffe2e0e;hp=ae4a030f1f892a6f0e5e4fdf1f9444564b163741;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp
diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index ae4a030f1f..3eb29e7e35 100644
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2009, 2010 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
@@ -31,7 +29,6 @@
#include
#include
#include
-#include
#include
#include
@@ -51,14 +48,16 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
int i;
lex_match_id (lexer, "FROM");
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
+
handle = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH);
if (!handle)
return CMD_FAILURE;
-
reader = any_reader_open (handle, &dict);
+ fh_unref (handle);
if (dict == NULL)
return CMD_FAILURE;
+
casereader_destroy (reader);
for (i = 0; i < dict_get_var_cnt (dict); i++)
@@ -89,30 +88,16 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
if (var_has_value_labels (s))
{
- if (!var_is_long_string (t))
- {
- 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);
- }
- else
- msg (SW, _("Cannot add value labels from source file to "
- "long string variable %s."),
- var_get_name (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);
}
if (var_has_missing_values (s))
{
- if (!var_is_long_string (t))
- {
- const struct missing_values *miss = var_get_missing_values (s);
- if (mv_is_resizable (miss, var_get_width (t)))
- var_set_missing_values (t, miss);
- }
- else
- msg (SW, _("Cannot apply missing values from source file to "
- "long string variable %s."),
- var_get_name (s));
+ const struct missing_values *miss = var_get_missing_values (s);
+ if (mv_is_resizable (miss, var_get_width (t)))
+ var_set_missing_values (t, miss);
}
if (var_is_numeric (s))
@@ -120,12 +105,19 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
var_set_print_format (t, var_get_print_format (s));
var_set_write_format (t, var_get_write_format (s));
}
+
+ if (var_has_attributes (s))
+ var_set_attributes (t, var_get_attributes (s));
}
if (!n_matched)
msg (SW, _("No matching variables found between the source "
"and target files."));
+ /* Data file attributes. */
+ if (dict_has_attributes (dict))
+ dict_set_attributes (dataset_dict (ds), dict_get_attributes (dict));
+
/* Weighting. */
if (dict_get_weight (dict) != NULL)
{