projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master into output branch.
[pspp]
/
src
/
language
/
data-io
/
print.c
diff --git
a/src/language/data-io/print.c
b/src/language/data-io/print.c
index 67dfa1290aab8a1bdd8754b77632e21269500640..dd1e26d270dab5d8d13eff9a85146260b68cc053 100644
(file)
--- a/
src/language/data-io/print.c
+++ b/
src/language/data-io/print.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006
, 2009
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
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
@@
-23,6
+23,7
@@
#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
+#include <data/format.h>
#include <language/command.h>
#include <language/data-io/data-writer.h>
#include <language/data-io/file-handle.h>
#include <language/command.h>
#include <language/data-io/data-writer.h>
#include <language/data-io/file-handle.h>
@@
-31,6
+32,7
@@
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/assertion.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/assertion.h>
+#include <libpspp/i18n.h>
#include <libpspp/compiler.h>
#include <libpspp/ll.h>
#include <libpspp/message.h>
#include <libpspp/compiler.h>
#include <libpspp/ll.h>
#include <libpspp/message.h>
@@
-82,6
+84,7
@@
struct print_trns
struct pool *pool; /* Stores related data. */
bool eject; /* Eject page before printing? */
bool include_prefix; /* Prefix lines with space? */
struct pool *pool; /* Stores related data. */
bool eject; /* Eject page before printing? */
bool include_prefix; /* Prefix lines with space? */
+ const char *encoding; /* Encoding to use for output. */
struct dfm_writer *writer; /* Output file, NULL=listing file. */
struct ll_list specs; /* List of struct prt_out_specs. */
size_t record_cnt; /* Number of records to write. */
struct dfm_writer *writer; /* Output file, NULL=listing file. */
struct ll_list specs; /* List of struct prt_out_specs. */
size_t record_cnt; /* Number of records to write. */
@@
-194,7
+197,10
@@
internal_cmd_print (struct lexer *lexer, struct dataset *ds,
trns->writer = dfm_open_writer (fh);
if (trns->writer == NULL)
goto error;
trns->writer = dfm_open_writer (fh);
if (trns->writer == NULL)
goto error;
+ trns->encoding = dfm_writer_get_legacy_encoding (trns->writer);
}
}
+ else
+ trns->encoding = LEGACY_NATIVE;
/* Output the variable table if requested. */
if (print_table)
/* Output the variable table if requested. */
if (print_table)
@@
-204,11
+210,13
@@
internal_cmd_print (struct lexer *lexer, struct dataset *ds,
add_transformation (ds, print_trns_proc, print_trns_free, trns);
pool_destroy (tmp_pool);
add_transformation (ds, print_trns_proc, print_trns_free, trns);
pool_destroy (tmp_pool);
+ fh_unref (fh);
return CMD_SUCCESS;
error:
print_trns_free (trns);
return CMD_SUCCESS;
error:
print_trns_free (trns);
+ fh_unref (fh);
return CMD_FAILURE;
}
\f
return CMD_FAILURE;
}
\f
@@
-256,9
+264,9
@@
parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns
}
if (trns->record_cnt != 0 && trns->record_cnt != record)
}
if (trns->record_cnt != 0 && trns->record_cnt != record)
- msg (SW, _("Output calls for %d records but %u specified on RECORDS "
+ msg (SW, _("Output calls for %d records but %
z
u specified on RECORDS "
"subcommand."),
"subcommand."),
- record,
(unsigned int)
trns->record_cnt);
+ record, trns->record_cnt);
trns->record_cnt = record;
return true;
trns->record_cnt = record;
return true;
@@
-282,7
+290,8
@@
parse_string_argument (struct lexer *lexer, struct print_trns *trns, int record,
int first_column, last_column;
bool range_specified;
int first_column, last_column;
bool range_specified;
- if (!parse_column_range (lexer, &first_column, &last_column, &range_specified))
+ if (!parse_column_range (lexer, 1,
+ &first_column, &last_column, &range_specified))
return false;
spec->first_column = first_column;
return false;
spec->first_column = first_column;
@@
-387,8
+396,8
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
int row;
spec_cnt = ll_count (&trns->specs);
int row;
spec_cnt = ll_count (&trns->specs);
- t = tab_create (4, spec_cnt + 1
, 0
);
- tab_columns (t, TAB_COL_DOWN
, 1
);
+ t = tab_create (4, spec_cnt + 1);
+ tab_columns (t, TAB_COL_DOWN);
tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 3, spec_cnt);
tab_hline (t, TAL_2, 0, 3, 1);
tab_headers (t, 0, 0, 1, 0);
tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 3, spec_cnt);
tab_hline (t, TAL_2, 0, 3, 1);
tab_headers (t, 0, 0, 1, 0);
@@
-396,7
+405,7
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Record"));
tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Columns"));
tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format"));
tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Record"));
tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Columns"));
tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format"));
- tab_dim (t, tab_natural_dimensions);
+ tab_dim (t, tab_natural_dimensions
, NULL, NULL
);
row = 1;
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
row = 1;
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
@@
-405,8
+414,9
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
switch (spec->type)
{
case PRT_LITERAL:
switch (spec->type)
{
case PRT_LITERAL:
- tab_text (t, 0, row, TAB_LEFT | TAB_FIX | TAT_PRINTF, "\"%.*s\"",
- (int) ds_length (&spec->string), ds_data (&spec->string));
+ tab_text_format (t, 0, row, TAB_LEFT | TAB_FIX, "\"%.*s\"",
+ (int) ds_length (&spec->string),
+ ds_data (&spec->string));
width = ds_length (&spec->string);
break;
case PRT_VAR:
width = ds_length (&spec->string);
break;
case PRT_VAR:
@@
-418,9
+428,9
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
default:
NOT_REACHED ();
}
default:
NOT_REACHED ();
}
- tab_text
(t, 1, row, TAT_PRINTF
, "%d", spec->record);
- tab_text
(t, 2, row, TAT_PRINTF
, "%3d-%3d",
- spec->first_column, spec->first_column + width - 1);
+ tab_text
_format (t, 1, row, 0
, "%d", spec->record);
+ tab_text
_format (t, 2, row, 0
, "%3d-%3d",
+
spec->first_column, spec->first_column + width - 1);
row++;
}
row++;
}
@@
-442,10
+452,11
@@
static void flush_records (struct print_trns *, int target_record,
/* Performs the transformation inside print_trns T on case C. */
static int
/* Performs the transformation inside print_trns T on case C. */
static int
-print_trns_proc (void *trns_, struct ccase *c, casenumber case_num UNUSED)
+print_trns_proc (void *trns_, struct ccase *
*
c, casenumber case_num UNUSED)
{
struct print_trns *trns = trns_;
bool eject = trns->eject;
{
struct print_trns *trns = trns_;
bool eject = trns->eject;
+ char encoded_space = legacy_from_native (trns->encoding, ' ');
int record = 1;
struct prt_out_spec *spec;
int record = 1;
struct prt_out_spec *spec;
@@
-455,20
+466,30
@@
print_trns_proc (void *trns_, struct ccase *c, casenumber case_num UNUSED)
{
flush_records (trns, spec->record, &eject, &record);
{
flush_records (trns, spec->record, &eject, &record);
- ds_set_length (&trns->line, spec->first_column,
' '
);
+ ds_set_length (&trns->line, spec->first_column,
encoded_space
);
if (spec->type == PRT_VAR)
{
if (spec->type == PRT_VAR)
{
- const union value *input = case_data (c, spec->var);
+ const union value *input = case_data (
*
c, spec->var);
char *output = ds_put_uninit (&trns->line, spec->format.w);
if (!spec->sysmis_as_spaces || input->f != SYSMIS)
char *output = ds_put_uninit (&trns->line, spec->format.w);
if (!spec->sysmis_as_spaces || input->f != SYSMIS)
- data_out
(input
, &spec->format, output);
+ data_out
_legacy (input, trns->encoding
, &spec->format, output);
else
else
- memset (output,
' '
, spec->format.w);
+ memset (output,
encoded_space
, spec->format.w);
if (spec->add_space)
if (spec->add_space)
- ds_put_char (&trns->line,
' '
);
+ ds_put_char (&trns->line,
encoded_space
);
}
else
}
else
- ds_put_substring (&trns->line, ds_ss (&spec->string));
+ {
+ ds_put_substring (&trns->line, ds_ss (&spec->string));
+ if (0 != strcmp (trns->encoding, LEGACY_NATIVE))
+ {
+ size_t length = ds_length (&spec->string);
+ char *data = ss_data (ds_tail (&trns->line, length));
+ char *s = recode_string (trns->encoding, LEGACY_NATIVE, data, length);
+ memcpy (data, s, length);
+ free (s);
+ }
+ }
}
flush_records (trns, trns->record_cnt + 1, &eject, &record);
}
flush_records (trns, trns->record_cnt + 1, &eject, &record);
@@
-499,7
+520,7
@@
flush_records (struct print_trns *trns, int target_record,
else
leader = '1';
}
else
leader = '1';
}
- line[0] = le
ader
;
+ line[0] = le
gacy_from_native (trns->encoding, leader)
;
if (trns->writer == NULL)
tab_output_text (TAB_FIX | TAT_NOWRAP, &line[1]);
if (trns->writer == NULL)
tab_output_text (TAB_FIX | TAT_NOWRAP, &line[1]);