X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fsave-translate.c;h=e68b4133bb6419f466c3aadc9745e86868b52453;hb=e2f99612bf4f4691623f16730eed3e55afdc54f0;hp=213f0bf735e40fe6b9ead6aac5aa66e3a1d698ad;hpb=55e6e7ba37a30570f5a31e2d78c22dfa7b61a36f;p=pspp diff --git a/src/language/data-io/save-translate.c b/src/language/data-io/save-translate.c index 213f0bf735..e68b4133bb 100644 --- a/src/language/data-io/save-translate.c +++ b/src/language/data-io/save-translate.c @@ -1,5 +1,5 @@ /* 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 @@ -22,10 +22,10 @@ #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" @@ -45,6 +45,7 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) 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; @@ -67,6 +68,8 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) type = 0; dict = dict_clone (dataset_dict (ds)); + dict_set_names_must_be_ids (dict, false); + stage = NULL; map = NULL; handle = NULL; @@ -81,11 +84,14 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) 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) @@ -96,7 +102,7 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) 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; } @@ -115,7 +121,7 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) type = TAB_FILE; else { - lex_error (lexer, _("expecting %s or %s"), "CSV", "TAB"); + lex_error_expecting (lexer, "CSV", "TAB", NULL_SENTINEL); goto error; } } @@ -132,7 +138,7 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) recode_user_missing = true; else { - lex_error (lexer, _("expecting %s or %s"), "IGNORE", "RECODE"); + lex_error_expecting (lexer, "IGNORE", "RECODE", NULL_SENTINEL); goto error; } } @@ -145,7 +151,7 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) use_value_labels = true; else { - lex_error (lexer, _("expecting %s or %s"), "VALUES", "LABELS"); + lex_error_expecting (lexer, "VALUES", "LABELS", NULL_SENTINEL); goto error; } } @@ -159,6 +165,7 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) lex_match (lexer, T_EQUALS); if (!lex_force_string (lexer)) goto error; + /* XXX should support multibyte UTF-8 delimiters */ if (ss_length (lex_tokss (lexer)) != 1) { msg (SE, _("The %s string must contain exactly one " @@ -173,6 +180,7 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) lex_match (lexer, T_EQUALS); if (!lex_force_string (lexer)) goto error; + /* XXX should support multibyte UTF-8 qualifiers */ if (ss_length (lex_tokss (lexer)) != 1) { msg (SE, _("The %s string must contain exactly one " @@ -191,8 +199,8 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) decimal = ','; else { - lex_error (lexer, _("expecting %s or %s"), - "DOT", "COMMA"); + lex_error_expecting (lexer, "DOT", "COMMA", + NULL_SENTINEL); goto error; } } @@ -205,8 +213,8 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) use_print_formats = true; else { - lex_error (lexer, _("expecting %s or %s"), - "PLAIN", "VARIABLE"); + lex_error_expecting (lexer, "PLAIN", "VARIABLE", + NULL_SENTINEL); goto error; } } @@ -223,30 +231,28 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) retain_unselected = false; else { - lex_error (lexer, _("expecting %s or %s"), "RETAIN", "DELETE"); + lex_error_expecting (lexer, "RETAIN", "DELETE", NULL_SENTINEL); goto error; } } else if (!parse_dict_trim (lexer, dict)) 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; } @@ -269,7 +275,8 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) 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); @@ -281,6 +288,7 @@ cmd_save_translate (struct lexer *lexer, struct dataset *ds) return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE; error: + case_map_stage_destroy (stage); fh_unref (handle); dict_destroy (dict); case_map_destroy (map);