X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fapply-dictionary.c;h=0b724044ae077a4a73ed58374355c59dd80f3b14;hb=3af9bac9f7828e3a98bb6a76bd6cf63e8d834a70;hp=da9a9731a553bb6e45c9212a2289c6123f72db42;hpb=888d0f91d57e0c3c5a4206c30ac71eb87bf44227;p=pspp

diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index da9a9731a5..0b724044ae 100644
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -1,29 +1,28 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
-   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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
 #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>
@@ -42,13 +41,13 @@ int
 cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
 {
   struct file_handle *handle;
-  struct any_reader *reader;
+  struct casereader *reader;
   struct dictionary *dict;
 
   int n_matched = 0;
 
   int i;
-  
+
   lex_match_id (lexer, "FROM");
   lex_match (lexer, '=');
   handle = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH);
@@ -58,7 +57,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
   reader = any_reader_open (handle, &dict);
   if (dict == NULL)
     return CMD_FAILURE;
-  any_reader_close (reader);
+  casereader_destroy (reader);
 
   for (i = 0; i < dict_get_var_cnt (dict); i++)
     {
@@ -85,33 +84,28 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
           if (strcspn (label, " ") != strlen (label))
             var_set_label (t, label);
         }
-      
-      if (val_labs_count (s->val_labs) && var_is_long_string (t))
-	msg (SW, _("Cannot add value labels from source file to "
-		   "long string variable %s."),
-	     var_get_name (s));
-      else if (val_labs_count (s->val_labs))
-	{
-          if (val_labs_can_set_width (s->val_labs, var_get_width (t)))
+
+      if (var_has_value_labels (s))
+        {
+          if (!var_is_long_string (t))
             {
-              val_labs_destroy (t->val_labs);
-              t->val_labs = s->val_labs;
-              val_labs_set_width (t->val_labs, var_get_width (t));
-              s->val_labs = val_labs_create (var_get_width (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);
             }
-	}
+          else
+            msg (SW, _("Cannot add value labels from source file to "
+                       "long string variable %s."),
+                 var_get_name (s));
+        }
 
       if (var_has_missing_values (s))
         {
           if (!var_is_long_string (t))
             {
-              struct missing_values miss;
-              mv_copy (&miss, var_get_missing_values (s));
-              if (mv_is_resizable (&miss, var_get_width (t))) 
-                {
-                  mv_resize (&miss, var_get_width (t));
-                  var_set_missing_values (t, &miss);
-                }
+              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 "
@@ -129,9 +123,9 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
   if (!n_matched)
     msg (SW, _("No matching variables found between the source "
 	       "and target files."));
-      
+
   /* Weighting. */
-  if (dict_get_weight (dict) != NULL) 
+  if (dict_get_weight (dict) != NULL)
     {
       struct variable *new_weight
         = dict_lookup_var (dataset_dict (ds),
@@ -140,8 +134,6 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
       if (new_weight != NULL)
         dict_set_weight (dataset_dict (ds), new_weight);
     }
-  
-  any_reader_close (reader);
 
   return lex_end_of_command (lexer);
 }