/* PSPP - a program for statistical analysis.
- Copyright (C) 2010, 2011, 2013 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 "language/lexer/lexer.h"
#include "libpspp/message.h"
-#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
struct casewriter *writer;
struct file_handle *handle;
- struct csv_writer_options csv_opts;
-
bool replace;
bool retain_unselected;
type = 0;
dict = dict_clone (dataset_dict (ds));
+ dict_set_names_must_be_ids (dict, false);
stage = NULL;
map = NULL;
include_var_names = false;
use_value_labels = false;
use_print_formats = false;
- decimal = settings_get_decimal_char (FMT_F);
+ decimal = settings_get_fmt_settings ()->decimal;
delimiter = 0;
qualifier = '"';
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)
type = TAB_FILE;
else
{
- lex_error_expecting (lexer, "CSV", "TAB", NULL_SENTINEL);
+ lex_error_expecting (lexer, "CSV", "TAB");
goto error;
}
}
recode_user_missing = true;
else
{
- lex_error_expecting (lexer, "IGNORE", "RECODE", NULL_SENTINEL);
+ lex_error_expecting (lexer, "IGNORE", "RECODE");
goto error;
}
}
use_value_labels = true;
else
{
- lex_error_expecting (lexer, "VALUES", "LABELS", NULL_SENTINEL);
+ lex_error_expecting (lexer, "VALUES", "LABELS");
goto error;
}
}
decimal = ',';
else
{
- lex_error_expecting (lexer, "DOT", "COMMA",
- NULL_SENTINEL);
+ lex_error_expecting (lexer, "DOT", "COMMA");
goto error;
}
}
use_print_formats = true;
else
{
- lex_error_expecting (lexer, "PLAIN", "VARIABLE",
- NULL_SENTINEL);
+ lex_error_expecting (lexer, "PLAIN", "VARIABLE");
goto error;
}
}
retain_unselected = false;
else
{
- lex_error_expecting (lexer, "RETAIN", "DELETE", NULL_SENTINEL);
+ 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 ("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 %s was not specified."),
fh_get_file_name (handle), "REPLACE");
dict_delete_scratch_vars (dict);
dict_compact_values (dict);
- csv_opts.recode_user_missing = recode_user_missing;
- csv_opts.include_var_names = include_var_names;
- csv_opts.use_value_labels = use_value_labels;
- csv_opts.use_print_formats = use_print_formats;
- csv_opts.decimal = decimal;
- csv_opts.delimiter = (delimiter ? delimiter
- : type == TAB_FILE ? '\t'
- : decimal == '.' ? ','
- : ';');
- csv_opts.qualifier = qualifier;
-
+ struct csv_writer_options csv_opts = {
+ .recode_user_missing = recode_user_missing,
+ .include_var_names = include_var_names,
+ .use_value_labels = use_value_labels,
+ .use_print_formats = use_print_formats,
+ .decimal = decimal,
+ .delimiter = (delimiter ? delimiter
+ : type == TAB_FILE ? '\t'
+ : decimal == '.' ? ','
+ : ';'),
+ .qualifier = qualifier,
+ };
writer = csv_writer_open (handle, dict, &csv_opts);
if (writer == NULL)
goto error;
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);
error:
case_map_stage_destroy (stage);
fh_unref (handle);
- dict_destroy (dict);
+ dict_unref (dict);
case_map_destroy (map);
return CMD_FAILURE;
}