treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[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..eae06df76c0c05ca2834f35a02b0ecf04c29f867 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.
-   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
@@ -20,10 +20,10 @@
 
 #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/procedure.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);
 
-  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,14 +80,13 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
        }
 
       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));
 
       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))
@@ -103,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));
     }
 
@@ -126,5 +125,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
         dict_set_weight (dataset_dict (ds), new_weight);
     }
 
+  dict_unref (dict);
+
   return CMD_SUCCESS;
 }