/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 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
#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>
-#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 "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)
int i;
lex_match_id (lexer, "FROM");
- lex_match (lexer, '=');
+ 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++)
{
- 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)
continue;
}
- if (var_get_label (s))
- {
- const char *label = var_get_label (s);
- if (strcspn (label, " ") != strlen (label))
- var_set_label (t, label);
- }
+ if (var_has_label (s))
+ 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))
dict_set_weight (dataset_dict (ds), new_weight);
}
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
}