#include <config.h>
#include <stdlib.h>
+#include <uniwidth.h>
#include "data/case.h"
#include "data/dataset.h"
#include "libpspp/message.h"
#include "libpspp/misc.h"
#include "libpspp/pool.h"
-#include "output/tab.h"
-#include "output/text-item.h"
+#include "libpspp/u8-line.h"
+#include "output/driver.h"
+#include "output/pivot-table.h"
+#include "output/table.h"
+#include "output/output-item.h"
#include "gl/xalloc.h"
#include "gettext.h"
+#define N_(msgid) msgid
#define _(msgid) gettext (msgid)
/* Describes what to do when an output field is encountered. */
/* PRT_LITERAL only. */
struct string string; /* String to output. */
+ int width; /* Width of 'string', in display columns. */
};
-static inline struct prt_out_spec *
-ll_to_prt_out_spec (struct ll *ll)
-{
- return ll_data (ll, struct prt_out_spec, ll);
-}
-
/* PRINT, PRINT EJECT, WRITE private data structure. */
struct print_trns
{
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 string line; /* Output buffer. */
+ size_t n_records; /* Number of records to write. */
};
enum which_formats
WRITE
};
+static const struct trns_class print_binary_trns_class;
+static const struct trns_class print_text_trns_class;
+
static int internal_cmd_print (struct lexer *, struct dataset *ds,
enum which_formats, bool eject);
-static trns_proc_func print_trns_proc;
-static trns_free_func print_trns_free;
static bool parse_specs (struct lexer *, struct pool *tmp_pool, struct print_trns *,
struct dictionary *dict, enum which_formats);
-static void dump_table (struct print_trns *, const struct file_handle *);
+static void dump_table (struct print_trns *);
+
+static bool print_trns_free (void *trns_);
\f
/* Basic parsing. */
internal_cmd_print (struct lexer *lexer, struct dataset *ds,
enum which_formats which_formats, bool eject)
{
- bool print_table = 0;
+ bool print_table = false;
+ const struct prt_out_spec *spec;
struct print_trns *trns;
struct file_handle *fh = NULL;
char *encoding = NULL;
struct pool *tmp_pool;
+ bool binary;
/* Fill in prt to facilitate error-handling. */
trns = pool_create_container (struct print_trns, pool);
trns->eject = eject;
trns->writer = NULL;
- trns->record_cnt = 0;
+ trns->n_records = 0;
ll_init (&trns->specs);
- ds_init_empty (&trns->line);
- ds_register_pool (&trns->line, trns->pool);
tmp_pool = pool_create_subpool (trns->pool);
{
lex_match (lexer, T_EQUALS);
lex_match (lexer, T_LPAREN);
- if (!lex_force_int (lexer))
+ if (!lex_force_int_range (lexer, "RECORDS", 0, INT_MAX))
goto error;
- trns->record_cnt = lex_integer (lexer);
+ trns->n_records = lex_integer (lexer);
lex_get (lexer);
lex_match (lexer, T_RPAREN);
}
if (!parse_specs (lexer, tmp_pool, trns, dataset_dict (ds), which_formats))
goto error;
+ /* Are there any binary formats?
+
+ There are real difficulties figuring out what to do when both binary
+ formats and nontrivial encodings enter the picture. So when binary
+ formats are present we fall back to much simpler handling. */
+ binary = false;
+ ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
+ {
+ if (spec->type == PRT_VAR
+ && fmt_get_category (spec->format.type) == FMT_CAT_BINARY)
+ {
+ binary = true;
+ break;
+ }
+ }
+ if (binary && fh == NULL)
+ {
+ msg (SE, _("%s is required when binary formats are specified."), "OUTFILE");
+ goto error;
+ }
+
if (lex_end_of_command (lexer) != CMD_SUCCESS)
goto error;
/* Output the variable table if requested. */
if (print_table)
- dump_table (trns, fh);
+ dump_table (trns);
/* Put the transformation in the queue. */
- add_transformation (ds, print_trns_proc, print_trns_free, trns);
+ add_transformation (ds, (binary
+ ? &print_binary_trns_class
+ : &print_text_trns_class), trns);
pool_destroy (tmp_pool);
fh_unref (fh);
if (lex_token (lexer) == T_ENDCMD)
{
- trns->record_cnt = 1;
+ trns->n_records = 1;
return true;
}
if (lex_is_string (lexer))
ok = parse_string_argument (lexer, trns, record, &column);
else
- ok = parse_variable_argument (lexer, dict, trns, tmp_pool, &record, &column,
- which_formats);
+ ok = parse_variable_argument (lexer, dict, trns, tmp_pool, &record,
+ &column, which_formats);
if (!ok)
return 0;
lex_match (lexer, T_COMMA);
}
- if (trns->record_cnt != 0 && trns->record_cnt != record)
+ if (trns->n_records != 0 && trns->n_records != record)
msg (SW, _("Output calls for %d records but %zu specified on RECORDS "
"subcommand."),
- record, trns->record_cnt);
- trns->record_cnt = record;
+ record, trns->n_records);
+ trns->n_records = record;
return true;
}
if (range_specified)
ds_set_length (&spec->string, last_column - first_column + 1, ' ');
}
- *column = spec->first_column + ds_length (&spec->string);
+
+ spec->width = u8_strwidth (CHAR_CAST (const uint8_t *,
+ ds_cstr (&spec->string)),
+ UTF8);
+ *column = spec->first_column + spec->width;
ll_push_tail (&trns->specs, &spec->ll);
return true;
enum which_formats which_formats)
{
const struct variable **vars;
- size_t var_cnt, var_idx;
+ size_t n_vars, var_idx;
struct fmt_spec *formats, *f;
- size_t format_cnt;
+ size_t n_formats;
bool add_space;
if (!parse_variables_const_pool (lexer, tmp_pool, dict,
- &vars, &var_cnt, PV_DUPLICATE))
+ &vars, &n_vars, PV_DUPLICATE))
return false;
if (lex_is_number (lexer) || lex_token (lexer) == T_LPAREN)
{
- if (!parse_var_placements (lexer, tmp_pool, var_cnt, FMT_FOR_OUTPUT,
- &formats, &format_cnt))
+ if (!parse_var_placements (lexer, tmp_pool, n_vars, FMT_FOR_OUTPUT,
+ &formats, &n_formats))
return false;
add_space = false;
}
lex_match (lexer, T_ASTERISK);
- formats = pool_nmalloc (tmp_pool, var_cnt, sizeof *formats);
- format_cnt = var_cnt;
- for (i = 0; i < var_cnt; i++)
+ formats = pool_nmalloc (tmp_pool, n_vars, sizeof *formats);
+ n_formats = n_vars;
+ for (i = 0; i < n_vars; i++)
{
const struct variable *v = vars[i];
formats[i] = (which_formats == PRINT
}
var_idx = 0;
- for (f = formats; f < &formats[format_cnt]; f++)
+ for (f = formats; f < &formats[n_formats]; f++)
if (!execute_placement_format (f, record, column))
{
const struct variable *var;
*column += f->w + add_space;
}
- assert (var_idx == var_cnt);
+ assert (var_idx == n_vars);
return true;
}
/* Prints the table produced by the TABLE subcommand to the listing
file. */
static void
-dump_table (struct print_trns *trns, const struct file_handle *fh)
+dump_table (struct print_trns *trns)
{
+ struct pivot_table *table = pivot_table_create (N_("Print Summary"));
+
+ pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Attributes"),
+ N_("Record"), N_("Columns"), N_("Format"));
+
+ struct pivot_dimension *variables = pivot_dimension_create (
+ table, PIVOT_AXIS_ROW, N_("Variable"));
+
struct prt_out_spec *spec;
- struct tab_table *t;
- int spec_cnt;
- int row;
-
- spec_cnt = ll_count (&trns->specs);
- t = tab_create (4, spec_cnt + 1);
- 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_text (t, 0, 0, TAB_CENTER | TAT_TITLE, _("Variable"));
- 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"));
- row = 1;
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
+ if (spec->type != PRT_VAR)
+ continue;
+
+ int row = pivot_category_create_leaf (
+ variables->root, pivot_value_new_variable (spec->var));
+
+ pivot_table_put2 (table, 0, row,
+ pivot_value_new_integer (spec->record));
+ int last_column = spec->first_column + spec->format.w - 1;
+ pivot_table_put2 (table, 1, row, pivot_value_new_user_text_nocopy (
+ xasprintf ("%d-%d",
+ spec->first_column, last_column)));
+
char fmt_string[FMT_STRING_LEN_MAX + 1];
- int width;
- switch (spec->type)
- {
- case PRT_LITERAL:
- 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:
- tab_text (t, 0, row, TAB_LEFT, var_get_name (spec->var));
- tab_text (t, 3, row, TAB_LEFT | TAB_FIX,
- fmt_to_string (&spec->format, fmt_string));
- width = spec->format.w;
- break;
- default:
- NOT_REACHED ();
- }
- 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++;
+ pivot_table_put2 (table, 2, row, pivot_value_new_user_text (
+ fmt_to_string (&spec->format, fmt_string), -1));
}
- if (fh != NULL)
- tab_title (t, ngettext ("Writing %zu record to %s.",
- "Writing %zu records to %s.", trns->record_cnt),
- trns->record_cnt, fh_get_name (fh));
- else
- tab_title (t, ngettext ("Writing %zu record.",
- "Writing %zu records.", trns->record_cnt),
- trns->record_cnt);
- tab_submit (t);
+ int row = pivot_category_create_leaf (
+ variables->root, pivot_value_new_text (N_("N of Records")));
+ pivot_table_put2 (table, 0, row,
+ pivot_value_new_integer (trns->n_records));
+
+ pivot_table_submit (table);
}
\f
-/* Transformation. */
+/* Transformation, for all-text output. */
-static void flush_records (struct print_trns *, int target_record,
- bool *eject, int *record);
+static void print_text_flush_records (struct print_trns *, struct u8_line *,
+ int target_record,
+ bool *eject, int *record);
/* Performs the transformation inside print_trns T on case C. */
-static int
-print_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
+static enum trns_result
+print_text_trns_proc (void *trns_, struct ccase **c,
+ casenumber case_num UNUSED)
{
struct print_trns *trns = trns_;
+ struct prt_out_spec *spec;
+ struct u8_line line;
+
bool eject = trns->eject;
- char encoded_space = recode_byte (trns->encoding, C_ENCODING, ' ');
int record = 1;
- struct prt_out_spec *spec;
- ds_clear (&trns->line);
- ds_put_byte (&trns->line, ' ');
+ u8_line_init (&line);
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
- flush_records (trns, spec->record, &eject, &record);
+ int x0 = spec->first_column;
- ds_set_length (&trns->line, spec->first_column, encoded_space);
+ print_text_flush_records (trns, &line, spec->record, &eject, &record);
+
+ u8_line_set_length (&line, spec->first_column);
if (spec->type == PRT_VAR)
{
const union value *input = case_data (*c, spec->var);
+ int x1;
+
if (!spec->sysmis_as_spaces || input->f != SYSMIS)
- data_out_recode (input, var_get_encoding (spec->var),
- &spec->format, &trns->line, trns->encoding);
+ {
+ size_t len;
+ int width;
+ char *s;
+
+ s = data_out (input, var_get_encoding (spec->var),
+ &spec->format, settings_get_fmt_settings ());
+ len = strlen (s);
+ width = u8_width (CHAR_CAST (const uint8_t *, s), len, UTF8);
+ x1 = x0 + width;
+ u8_line_put (&line, x0, x1, s, len);
+ free (s);
+ }
else
- ds_put_byte_multiple (&trns->line, encoded_space, spec->format.w);
+ {
+ int n = spec->format.w;
+
+ x1 = x0 + n;
+ memset (u8_line_reserve (&line, x0, x1, n), ' ', n);
+ }
+
if (spec->add_space)
- ds_put_byte (&trns->line, encoded_space);
+ *u8_line_reserve (&line, x1, x1 + 1, 1) = ' ';
}
else
{
- ds_put_substring (&trns->line, ds_ss (&spec->string));
- if (0 != strcmp (trns->encoding, C_ENCODING))
- {
- size_t length = ds_length (&spec->string);
- char *data = ss_data (ds_tail (&trns->line, length));
- char *s = recode_string (trns->encoding, C_ENCODING, data, length);
- memcpy (data, s, length);
- free (s);
- }
+ const struct string *s = &spec->string;
+
+ u8_line_put (&line, x0, x0 + spec->width,
+ ds_data (s), ds_length (s));
}
}
- flush_records (trns, trns->record_cnt + 1, &eject, &record);
+ print_text_flush_records (trns, &line, trns->n_records + 1,
+ &eject, &record);
+ u8_line_destroy (&line);
if (trns->writer != NULL && dfm_write_error (trns->writer))
return TRNS_ERROR;
output is preceded by ejecting the page (and *EJECT is set
false). */
static void
-flush_records (struct print_trns *trns, int target_record,
- bool *eject, int *record)
+print_text_flush_records (struct print_trns *trns, struct u8_line *line,
+ int target_record, bool *eject, int *record)
{
for (; target_record > *record; (*record)++)
{
- char *line = ds_cstr (&trns->line);
- size_t length = ds_length (&trns->line);
char leader = ' ';
if (*eject)
{
*eject = false;
if (trns->writer == NULL)
- text_item_submit (text_item_create (TEXT_ITEM_EJECT_PAGE, ""));
+ output_item_submit (page_break_item_create ());
else
leader = '1';
}
- line[0] = recode_byte (trns->encoding, C_ENCODING, leader);
+ *u8_line_reserve (line, 0, 1, 1) = leader;
if (trns->writer == NULL)
- tab_output_text (TAB_FIX, &line[1]);
+ output_log ("%s", ds_cstr (&line->s) + 1);
else
{
+ size_t len = ds_length (&line->s);
+ char *s = ds_cstr (&line->s);
+
if (!trns->include_prefix)
{
- line++;
- length--;
+ s++;
+ len--;
}
- dfm_put_record (trns->writer, line, length);
+
+ dfm_put_record_utf8 (trns->writer, s, len);
}
+ }
+}
+\f
+/* Transformation, for output involving binary. */
- ds_truncate (&trns->line, 1);
+static void print_binary_flush_records (struct print_trns *,
+ struct string *line, int target_record,
+ bool *eject, int *record);
+
+/* Performs the transformation inside print_trns T on case C. */
+static enum trns_result
+print_binary_trns_proc (void *trns_, struct ccase **c,
+ casenumber case_num UNUSED)
+{
+ struct print_trns *trns = trns_;
+ bool eject = trns->eject;
+ char encoded_space = recode_byte (trns->encoding, C_ENCODING, ' ');
+ int record = 1;
+ struct prt_out_spec *spec;
+ struct string line;
+
+ ds_init_empty (&line);
+ ds_put_byte (&line, ' ');
+ ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
+ {
+ print_binary_flush_records (trns, &line, spec->record, &eject, &record);
+
+ ds_set_length (&line, spec->first_column, encoded_space);
+ if (spec->type == PRT_VAR)
+ {
+ const union value *input = case_data (*c, spec->var);
+ if (!spec->sysmis_as_spaces || input->f != SYSMIS)
+ data_out_recode (input, var_get_encoding (spec->var),
+ &spec->format, settings_get_fmt_settings (),
+ &line, trns->encoding);
+ else
+ ds_put_byte_multiple (&line, encoded_space, spec->format.w);
+ if (spec->add_space)
+ ds_put_byte (&line, encoded_space);
+ }
+ else
+ {
+ ds_put_substring (&line, ds_ss (&spec->string));
+ if (0 != strcmp (trns->encoding, UTF8))
+ {
+ size_t length = ds_length (&spec->string);
+ char *data = ss_data (ds_tail (&line, length));
+ char *s = recode_string (trns->encoding, UTF8, data, length);
+ memcpy (data, s, length);
+ free (s);
+ }
+ }
}
+ print_binary_flush_records (trns, &line, trns->n_records + 1,
+ &eject, &record);
+ ds_destroy (&line);
+
+ if (trns->writer != NULL && dfm_write_error (trns->writer))
+ return TRNS_ERROR;
+ return TRNS_CONTINUE;
}
+/* Advance from *RECORD to TARGET_RECORD, outputting records
+ along the way. If *EJECT is true, then the first record
+ output is preceded by ejecting the page (and *EJECT is set
+ false). */
+static void
+print_binary_flush_records (struct print_trns *trns, struct string *line,
+ int target_record, bool *eject, int *record)
+{
+ for (; target_record > *record; (*record)++)
+ {
+ char *s = ds_cstr (line);
+ size_t length = ds_length (line);
+ char leader = ' ';
+
+ if (*eject)
+ {
+ *eject = false;
+ leader = '1';
+ }
+ s[0] = recode_byte (trns->encoding, C_ENCODING, leader);
+
+ if (!trns->include_prefix)
+ {
+ s++;
+ length--;
+ }
+ dfm_put_record (trns->writer, s, length);
+
+ ds_truncate (line, 1);
+ }
+}
+\f
/* Frees TRNS. */
static bool
print_trns_free (void *trns_)
return ok;
}
+static const struct trns_class print_binary_trns_class = {
+ .name = "PRINT",
+ .execute = print_binary_trns_proc,
+ .destroy = print_trns_free,
+};
+
+static const struct trns_class print_text_trns_class = {
+ .name = "PRINT",
+ .execute = print_text_trns_proc,
+ .destroy = print_trns_free,
+};
+