/* PSPP - computes sample statistics.
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
#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>
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);
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++)
{
if (strcspn (label, " ") != strlen (label))
var_set_label (t, label);
}
-
+
if (var_has_value_labels (s))
{
if (!var_is_long_string (t))
"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
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),
if (new_weight != NULL)
dict_set_weight (dataset_dict (ds), new_weight);
}
-
- any_reader_close (reader);
return lex_end_of_command (lexer);
}