/* PSPP - a program for statistical analysis.
- Copyright (C) 2010 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011, 2013, 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 "data/casereader.h"
#include "data/casewriter.h"
#include "data/csv-file-writer.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/file-name.h"
#include "data/format.h"
-#include "data/procedure.h"
#include "data/settings.h"
#include "language/command.h"
#include "language/data-io/file-handle.h"
enum { CSV_FILE = 1, TAB_FILE } type;
struct dictionary *dict;
+ struct case_map_stage *stage;
struct case_map *map;
struct casewriter *writer;
struct file_handle *handle;
type = 0;
dict = dict_clone (dataset_dict (ds));
+ dict_set_names_must_be_ids (dict, false);
+ stage = NULL;
map = NULL;
handle = NULL;
delimiter = 0;
qualifier = '"';
- case_map_prepare_dict (dict);
+ stage = case_map_stage_create (dict);
dict_delete_scratch_vars (dict);
- while (lex_match (lexer, T_SLASH))
+ while (lex_token (lexer) != T_ENDCMD)
{
+ if (!lex_force_match (lexer, T_SLASH))
+ goto error;
+
if (lex_match_id (lexer, "OUTFILE"))
{
if (handle != NULL)
lex_match (lexer, T_EQUALS);
- handle = fh_parse (lexer, FH_REF_FILE);
+ handle = fh_parse (lexer, FH_REF_FILE, NULL);
if (handle == NULL)
goto error;
}
type = TAB_FILE;
else
{
- lex_error (lexer, _("expecting %s or %s"), "CSV", "TAB");
+ lex_error_expecting (lexer, "CSV", "TAB");
goto error;
}
}
recode_user_missing = true;
else
{
- lex_error (lexer, _("expecting %s or %s"), "IGNORE", "RECODE");
+ lex_error_expecting (lexer, "IGNORE", "RECODE");
goto error;
}
}
use_value_labels = true;
else
{
- lex_error (lexer, _("expecting %s or %s"), "VALUES", "LABELS");
+ lex_error_expecting (lexer, "VALUES", "LABELS");
goto error;
}
}
lex_match (lexer, T_EQUALS);
if (!lex_force_string (lexer))
goto error;
- if (ds_length (lex_tokstr (lexer)) != 1)
+ /* XXX should support multibyte UTF-8 delimiters */
+ if (ss_length (lex_tokss (lexer)) != 1)
{
msg (SE, _("The %s string must contain exactly one "
"character."), "DELIMITER");
goto error;
}
- delimiter = ds_first (lex_tokstr (lexer));
+ delimiter = ss_first (lex_tokss (lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "QUALIFIER"))
lex_match (lexer, T_EQUALS);
if (!lex_force_string (lexer))
goto error;
- if (ds_length (lex_tokstr (lexer)) != 1)
+ /* XXX should support multibyte UTF-8 qualifiers */
+ if (ss_length (lex_tokss (lexer)) != 1)
{
msg (SE, _("The %s string must contain exactly one "
"character."), "QUALIFIER");
goto error;
}
- qualifier = ds_first (lex_tokstr (lexer));
+ qualifier = ss_first (lex_tokss (lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "DECIMAL"))
decimal = ',';
else
{
- lex_error (lexer, _("expecting %s or %s"),
- "DOT", "COMMA");
+ lex_error_expecting (lexer, "DOT", "COMMA");
goto error;
}
}
use_print_formats = true;
else
{
- lex_error (lexer, _("expecting %s or %s"),
- "PLAIN", "VARIABLE");
+ lex_error_expecting (lexer, "PLAIN", "VARIABLE");
goto error;
}
}
retain_unselected = false;
else
{
- lex_error (lexer, _("expecting %s or %s"), "RETAIN", "DELETE");
+ lex_error_expecting (lexer, "RETAIN", "DELETE");
goto error;
}
}
- else if (!parse_dict_trim (lexer, dict))
+ else if (!parse_dict_trim (lexer, dict, true))
goto error;
}
- if (lex_end_of_command (lexer) != CMD_SUCCESS)
- goto error;
if (type == 0)
{
- lex_sbc_missing (lexer, "TYPE");
+ lex_sbc_missing ("TYPE");
goto error;
}
else if (handle == NULL)
{
- lex_sbc_missing (lexer, "OUTFILE");
+ lex_sbc_missing ("OUTFILE");
goto error;
}
- else if (!replace && fn_exists (fh_get_file_name (handle)))
+ else if (!replace && fn_exists (handle))
{
- msg (SE, _("Output file `%s' exists but REPLACE was not specified."),
- fh_get_file_name (handle));
+ msg (SE, _("Output file `%s' exists but %s was not specified."),
+ fh_get_file_name (handle), "REPLACE");
goto error;
}
goto error;
fh_unref (handle);
- map = case_map_from_dict (dict);
+ map = case_map_stage_get_case_map (stage);
+ case_map_stage_destroy (stage);
if (map != NULL)
writer = case_map_create_output_translator (map, writer);
- dict_destroy (dict);
+ dict_unref (dict);
casereader_transfer (proc_open_filtering (ds, !retain_unselected), writer);
ok = casewriter_destroy (writer);
return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE;
error:
+ case_map_stage_destroy (stage);
fh_unref (handle);
- dict_destroy (dict);
+ dict_unref (dict);
case_map_destroy (map);
return CMD_FAILURE;
}