X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fapply-dictionary.c;h=ff4d7853c3a5e8b6487fafb40e111e8dd624d17e;hb=44dab63eeb3b50a9939d58005e63b2bfae0f846f;hp=0c9f2ade468d290cfdad8877b3cde1e1d2c4422b;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp-builds.git

diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index 0c9f2ade..ff4d7853 100644
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -1,26 +1,25 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 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 <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>
@@ -42,23 +41,25 @@ 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);
   if (!handle)
     return CMD_FAILURE;
-
   reader = any_reader_open (handle, &dict);
+  fh_unref (handle);
   if (dict == NULL)
     return CMD_FAILURE;
-  any_reader_close (reader);
+
+  casereader_destroy (reader);
 
   for (i = 0; i < dict_get_var_cnt (dict); i++)
     {
@@ -85,7 +86,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
           if (strcspn (label, " ") != strlen (label))
             var_set_label (t, label);
         }
-      
+
       if (var_has_value_labels (s))
         {
           if (!var_is_long_string (t))
@@ -99,13 +100,13 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
                        "long string variable %s."),
                  var_get_name (s));
         }
-      
+
       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))) 
+              if (mv_is_resizable (miss, var_get_width (t)))
                 var_set_missing_values (t, miss);
             }
           else
@@ -124,9 +125,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),
@@ -135,8 +136,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);
 }