#include "language/lexer/lexer.h"
#include "libpspp/assertion.h"
#include "libpspp/compiler.h"
+#include "libpspp/message.h"
#include "gl/xalloc.h"
struct casewriter *writer; /* Writer. */
struct case_map_stage *stage; /* Preparation for 'map'. */
struct case_map *map; /* Map from input data to data for writer. */
+ const char *sav_name = "";
/* Common options. */
struct sfm_write_options sysfile_opts;
cw = true;
else
{
- lex_error_expecting (lexer, "READONLY", "WRITEABLE",
- NULL_SENTINEL);
+ lex_error_expecting (lexer, "READONLY", "WRITEABLE");
goto error;
}
sysfile_opts.create_writeable = porfile_opts.create_writeable = cw;
*retain_unselected = false;
else
{
- lex_error_expecting (lexer, "RETAIN", "DELETE", NULL_SENTINEL);
+ lex_error_expecting (lexer, "RETAIN", "DELETE");
goto error;
}
}
porfile_opts.type = PFM_TAPE;
else
{
- lex_error_expecting (lexer, "COMM", "TAPE", NULL_SENTINEL);
+ lex_error_expecting (lexer, "COMM", "TAPE");
goto error;
}
}
porfile_opts.digits = lex_integer (lexer);
lex_get (lexer);
}
- else if (!parse_dict_trim (lexer, dict))
+ else if (!parse_dict_trim (lexer, dict, false))
goto error;
if (!lex_match (lexer, T_SLASH))
if (lex_end_of_command (lexer) != CMD_SUCCESS)
goto error;
- if (handle == NULL)
+ if (!handle && !metadata)
{
- lex_sbc_missing ("OUTFILE");
+ msg (SE, _("The OUTFILE or METADATA subcommand is required."));
goto error;
}
dict_delete_scratch_vars (dict);
dict_compact_values (dict);
- if (fh_get_referent (handle) == FH_REF_FILE)
+ if (handle)
{
- switch (writer_type)
+ if (metadata)
+ sav_name = (fh_get_referent (handle) == FH_REF_FILE
+ ? fh_get_file_name (handle)
+ : fh_get_name (handle));
+ if (fh_get_referent (handle) == FH_REF_FILE)
{
- case SYSFILE_WRITER:
- writer = sfm_open_writer (handle, dict, sysfile_opts);
- break;
- case PORFILE_WRITER:
- writer = pfm_open_writer (handle, dict, porfile_opts);
- break;
+ switch (writer_type)
+ {
+ case SYSFILE_WRITER:
+ writer = sfm_open_writer (handle, dict, sysfile_opts);
+ break;
+ case PORFILE_WRITER:
+ writer = pfm_open_writer (handle, dict, porfile_opts);
+ break;
+ }
}
+ else
+ writer = any_writer_open (handle, dict);
+ if (writer == NULL)
+ goto error;
}
- else
- writer = any_writer_open (handle, dict);
- if (writer == NULL)
- goto error;
if (metadata)
{
- const char *sav_name = (fh_get_referent (handle) == FH_REF_FILE
- ? fh_get_file_name (handle)
- : fh_get_name (handle));
if (!mdd_write (metadata, dict, sav_name))
goto error;
}
case_map_stage_destroy (stage);
if (map != NULL)
writer = case_map_create_output_translator (map, writer);
- dict_destroy (dict);
+ dict_unref (dict);
fh_unref (handle);
fh_unref (metadata);
fh_unref (handle);
fh_unref (metadata);
casewriter_destroy (writer);
- dict_destroy (dict);
+ dict_unref (dict);
case_map_destroy (map);
return NULL;
}