X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fapply-dictionary.c;h=eae06df76c0c05ca2834f35a02b0ecf04c29f867;hb=033449d465fb54526d3984d55772e6a38e7d922c;hp=a1b3310176e1687385dd2dbf3bc124e711e08da1;hpb=a1efcf97ca2f75f4be6a0389ff2372c03ed2d4e1;p=pspp

diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index a1b3310176..eae06df76c 100644
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 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
@@ -18,20 +18,19 @@
 
 #include <stdlib.h>
 
-#include <data/any-reader.h>
-#include <data/casereader.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 <language/data-io/file-handle.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/hash.h>
-#include <libpspp/message.h>
-#include <libpspp/str.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/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,21 +48,21 @@ 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);
+  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_and_decode (handle, NULL, &dict, NULL);
   fh_unref (handle);
-  if (dict == NULL)
+  if (!reader)
     return CMD_FAILURE;
 
   casereader_destroy (reader);
 
-  for (i = 0; i < dict_get_var_cnt (dict); i++)
+  for (i = 0; i < dict_get_n_vars (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)
@@ -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));
 
       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 (t, 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))
@@ -121,7 +102,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
           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));
     }
 
@@ -144,5 +125,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
         dict_set_weight (dataset_dict (ds), new_weight);
     }
 
-  return lex_end_of_command (lexer);
+  dict_unref (dict);
+
+  return CMD_SUCCESS;
 }