X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fapply-dictionary.c;h=8531ba56d2d257d30e3cc085ab42fafa91bca19c;hb=refs%2Fbuilds%2F20130127032105%2Fpspp;hp=ac38a0899a1b6e7b849fdb7d00b4c63c55b1dcfe;hpb=92c09e564002d356d20fc1e2e131027ef89f6748;p=pspp
diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index ac38a0899a..8531ba56d2 100644
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -1,39 +1,36 @@
-/* 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, 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 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
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#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/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -49,16 +46,18 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
int n_matched = 0;
int i;
-
+
lex_match_id (lexer, "FROM");
- lex_match (lexer, '=');
- handle = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH);
+ lex_match (lexer, T_EQUALS);
+
+ handle = fh_parse (lexer, FH_REF_FILE, dataset_session (ds));
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;
+
casereader_destroy (reader);
for (i = 0; i < dict_get_var_cnt (dict); i++)
@@ -80,39 +79,21 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
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), false);
+
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,14 +101,21 @@ 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)
+ if (dict_get_weight (dict) != NULL)
{
struct variable *new_weight
= dict_lookup_var (dataset_dict (ds),
@@ -136,6 +124,6 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
if (new_weight != NULL)
dict_set_weight (dataset_dict (ds), new_weight);
}
-
- return lex_end_of_command (lexer);
+
+ return CMD_SUCCESS;
}