-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+ 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 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 <language/command.h>
-#include <data/dictionary.h>
-#include <libpspp/message.h>
-#include <data/file-handle-def.h>
-#include <libpspp/hash.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/str.h>
-#include <data/value-labels.h>
-#include <data/variable.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)
-#include <libpspp/debug-print.h>
-
/* Parses and executes APPLY DICTIONARY. */
int
-cmd_apply_dictionary (void)
+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 ("FROM");
- lex_match ('=');
- handle = fh_parse (FH_REF_FILE | FH_REF_SCRATCH);
+
+ lex_match_id (lexer, "FROM");
+ lex_match (lexer, T_EQUALS);
+
+ handle = fh_parse (lexer, FH_REF_FILE, dataset_session (ds));
if (!handle)
return CMD_FAILURE;
-
- reader = any_reader_open (handle, &dict);
- if (dict == NULL)
+ reader = any_reader_open_and_decode (handle, NULL, &dict, NULL);
+ fh_unref (handle);
+ if (!reader)
return CMD_FAILURE;
- any_reader_close (reader);
+
+ casereader_destroy (reader);
for (i = 0; i < dict_get_var_cnt (dict); i++)
{
- struct variable *s = dict_get_var (dict, i);
- struct variable *t = dict_lookup_var (default_dict, s->name);
+ 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)
continue;
n_matched++;
- if (s->type != t->type)
+ if (var_get_type (s) != var_get_type (t))
{
msg (SW, _("Variable %s is %s in target file, but %s in "
"source file."),
- s->name,
- t->type == ALPHA ? _("string") : _("numeric"),
- s->type == ALPHA ? _("string") : _("numeric"));
+ var_get_name (s),
+ var_is_alpha (t) ? _("string") : _("numeric"),
+ var_is_alpha (s) ? _("string") : _("numeric"));
continue;
}
- if (s->label && strcspn (s->label, " ") != strlen (s->label))
- {
- free (t->label);
- t->label = s->label;
- s->label = NULL;
- }
+ if (var_has_label (s))
+ var_set_label (t, var_get_label (s));
- if (val_labs_count (s->val_labs) && t->width > MAX_SHORT_STRING)
- msg (SW, _("Cannot add value labels from source file to "
- "long string variable %s."),
- s->name);
- else if (val_labs_count (s->val_labs))
- {
- /* Whether to apply the value labels. */
- int apply = 1;
-
- if (t->width < s->width)
- {
- struct val_labs_iterator *i;
- struct val_lab *lab;
-
- for (lab = val_labs_first (s->val_labs, &i); lab != NULL;
- lab = val_labs_next (s->val_labs, &i))
- {
- int j;
-
- /* We will apply the value labels only if all
- the truncated characters are blanks. */
- for (j = t->width; j < s->width; j++)
- if (lab->value.s[j] != ' ')
- {
- val_labs_done (&i);
- apply = 0;
- break;
- }
- }
- }
- else
- {
- /* Fortunately, we follow the convention that all value
- label values are right-padded with spaces, so it is
- unnecessary to bother padding values here. */
- }
-
- if (apply)
- {
- val_labs_destroy (t->val_labs);
- t->val_labs = s->val_labs;
- val_labs_set_width (t->val_labs, t->width);
- s->val_labs = val_labs_create (s->width);
- }
- }
+ 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 (t, value_labels);
+ }
- if (!mv_is_empty (&s->miss) && t->width > MAX_SHORT_STRING)
- msg (SW, _("Cannot apply missing values from source file to "
- "long string variable %s."),
- s->name);
- else if (!mv_is_empty (&s->miss))
- {
- if (mv_is_resizable (&s->miss, t->width))
- {
- mv_copy (&t->miss, &s->miss);
- mv_resize (&t->miss, t->width);
- }
- }
+ if (var_has_missing_values (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 (s->type == NUMERIC)
+ if (var_is_numeric (s))
{
- t->print = s->print;
- t->write = s->write;
+ var_set_print_format (t, var_get_print_format (s));
+ var_set_write_format (t, var_get_write_format (s));
}
+
+ if (var_has_attributes (s))
+ var_set_attributes (t, var_get_attributes (s));
}
if (!n_matched)
msg (SW, _("No matching variables found between the source "
"and target files."));
-
+
+ /* Data file attributes. */
+ if (dict_has_attributes (dict))
+ dict_set_attributes (dataset_dict (ds), dict_get_attributes (dict));
+
/* Weighting. */
- if (dict_get_weight (dict) != NULL)
+ if (dict_get_weight (dict) != NULL)
{
struct variable *new_weight
- = dict_lookup_var (default_dict, dict_get_weight (dict)->name);
+ = dict_lookup_var (dataset_dict (ds),
+ var_get_name (dict_get_weight (dict)));
if (new_weight != NULL)
- dict_set_weight (default_dict, new_weight);
+ dict_set_weight (dataset_dict (ds), new_weight);
}
-
- any_reader_close (reader);
- return lex_end_of_command ();
+ return CMD_SUCCESS;
}
projects / pspp / blobdiff