X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fprint.c;h=91d2d9c180c85748b0b71889e6b468a7ac15a244;hb=00d5ccd2b3072493b84dbf85b40467ef0a2c1df8;hp=91a3f27bfd5ca76b98a34b9f1eabca16056b2adb;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c index 91a3f27bfd..91d2d9c180 100644 --- a/src/language/data-io/print.c +++ b/src/language/data-io/print.c @@ -1,48 +1,54 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include #include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include "data/case.h" +#include "data/dataset.h" +#include "data/data-out.h" +#include "data/format.h" +#include "data/transformations.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/data-io/data-writer.h" +#include "language/data-io/file-handle.h" +#include "language/data-io/placement-parser.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/assertion.h" +#include "libpspp/compiler.h" +#include "libpspp/i18n.h" +#include "libpspp/ll.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.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. */ @@ -62,46 +68,44 @@ struct prt_out_spec int first_column; /* 0-based first column. */ /* PRT_VAR only. */ - struct variable *var; /* Associated variable. */ + const struct variable *var; /* Associated variable. */ struct fmt_spec format; /* Output spec. */ bool add_space; /* Add trailing space? */ bool sysmis_as_spaces; /* Output SYSMIS as spaces? */ /* 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 { 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 string line; /* Output buffer. */ + size_t n_records; /* Number of records to write. */ }; enum which_formats { - PRINT, + PRINT, WRITE }; -static int internal_cmd_print (struct lexer *, struct dataset *ds, +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_); /* Basic parsing. */ @@ -128,45 +132,57 @@ cmd_write (struct lexer *lexer, struct dataset *ds) /* Parses the output commands. */ static int -internal_cmd_print (struct lexer *lexer, struct dataset *ds, +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); /* Parse the command options. */ - while (lex_token (lexer) != '/' && lex_token (lexer) != '.') + while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD) { if (lex_match_id (lexer, "OUTFILE")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); - fh = fh_parse (lexer, FH_REF_FILE); + fh = fh_parse (lexer, FH_REF_FILE, NULL); if (fh == NULL) goto error; } + else if (lex_match_id (lexer, "ENCODING")) + { + lex_match (lexer, T_EQUALS); + if (!lex_force_string (lexer)) + goto error; + + free (encoding); + encoding = ss_xstrdup (lex_tokss (lexer)); + + lex_get (lexer); + } else if (lex_match_id (lexer, "RECORDS")) { - lex_match (lexer, '='); - lex_match (lexer, '('); - if (!lex_force_int (lexer)) + lex_match (lexer, T_EQUALS); + lex_match (lexer, T_LPAREN); + 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, ')'); + lex_match (lexer, T_RPAREN); } else if (lex_match_id (lexer, "TABLE")) print_table = true; @@ -174,7 +190,8 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds, print_table = false; else { - lex_error (lexer, _("expecting a valid subcommand")); + lex_error_expecting (lexer, "OUTFILE", "ENCODING", "RECORDS", + "TABLE", "NOTABLE"); goto error; } } @@ -187,35 +204,63 @@ internal_cmd_print (struct lexer *lexer, struct dataset *ds, 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; if (fh != NULL) { - trns->writer = dfm_open_writer (fh); + trns->writer = dfm_open_writer (fh, encoding); if (trns->writer == NULL) goto error; + trns->encoding = dfm_writer_get_encoding (trns->writer); } + else + trns->encoding = UTF8; /* 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); return CMD_SUCCESS; error: print_trns_free (trns); + fh_unref (fh); return CMD_FAILURE; } static bool parse_string_argument (struct lexer *, struct print_trns *, int record, int *column); -static bool parse_variable_argument (struct lexer *, const struct dictionary *, +static bool parse_variable_argument (struct lexer *, const struct dictionary *, struct print_trns *, struct pool *tmp_pool, int *record, int *column, @@ -226,41 +271,41 @@ static bool parse_variable_argument (struct lexer *, const struct dictionary *, Returns success. */ static bool parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns, - struct dictionary *dict, + struct dictionary *dict, enum which_formats which_formats) { int record = 0; int column = 1; - if (lex_token (lexer) == '.') + if (lex_token (lexer) == T_ENDCMD) { - trns->record_cnt = 1; + trns->n_records = 1; return true; } - while (lex_token (lexer) != '.') + while (lex_token (lexer) != T_ENDCMD) { bool ok; if (!parse_record_placement (lexer, &record, &column)) return false; - if (lex_token (lexer) == T_STRING) + 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, ','); + lex_match (lexer, T_COMMA); } - if (trns->record_cnt != 0 && trns->record_cnt != record) - msg (SW, _("Output calls for %d records but %d specified on RECORDS " + 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; } @@ -273,7 +318,7 @@ parse_string_argument (struct lexer *lexer, struct print_trns *trns, int record, spec->type = PRT_LITERAL; spec->record = record; spec->first_column = *column; - ds_init_string (&spec->string, lex_tokstr (lexer)); + ds_init_substring (&spec->string, lex_tokss (lexer)); ds_register_pool (&spec->string, trns->pool); lex_get (lexer); @@ -283,14 +328,19 @@ parse_string_argument (struct lexer *lexer, struct print_trns *trns, int record, int first_column, last_column; bool range_specified; - if (!parse_column_range (lexer, &first_column, &last_column, &range_specified)) - return false; + if (!parse_column_range (lexer, 1, + &first_column, &last_column, &range_specified)) + return false; spec->first_column = first_column; 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; @@ -305,74 +355,77 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict, int *record, int *column, enum which_formats which_formats) { - struct variable **vars; - size_t var_cnt, var_idx; - struct fmt_spec *formats, *f; - size_t format_cnt; - bool add_space; - - if (!parse_variables_pool (lexer, tmp_pool, dict, - &vars, &var_cnt, PV_DUPLICATE)) + const struct variable **vars; + size_t n_vars; + if (!parse_variables_const_pool (lexer, tmp_pool, dict, + &vars, &n_vars, PV_DUPLICATE)) return false; - if (lex_is_number (lexer) || lex_token (lexer) == '(') + struct fmt_spec *formats, *f; + size_t n_formats; + bool add_space; + int formats_start = lex_ofs (lexer); + if (lex_is_number (lexer) || lex_token (lexer) == T_LPAREN) { - if (!parse_var_placements (lexer, tmp_pool, var_cnt, false, - &formats, &format_cnt)) + if (!parse_var_placements (lexer, tmp_pool, n_vars, FMT_FOR_OUTPUT, + &formats, &n_formats)) return false; add_space = false; } else { - size_t i; + lex_match (lexer, T_ASTERISK); - lex_match (lexer, '*'); - - 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 (size_t i = 0; i < n_vars; i++) { - struct variable *v = vars[i]; + const struct variable *v = vars[i]; formats[i] = (which_formats == PRINT ? *var_get_print_format (v) : *var_get_write_format (v)); } add_space = which_formats == PRINT; } + int formats_end = lex_ofs (lexer) - 1; - var_idx = 0; - for (f = formats; f < &formats[format_cnt]; f++) + size_t var_idx = 0; + for (f = formats; f < &formats[n_formats]; f++) if (!execute_placement_format (f, record, column)) { - struct variable *var; - struct prt_out_spec *spec; - - var = vars[var_idx++]; - if (!fmt_check_width_compat (f, var_get_width (var))) - return false; - - spec = pool_alloc (trns->pool, sizeof *spec); - spec->type = PRT_VAR; - spec->record = *record; - spec->first_column = *column; - spec->var = var; - spec->format = *f; - spec->add_space = add_space; - - /* This is a completely bizarre twist for compatibility: - WRITE outputs the system-missing value as a field - filled with spaces, instead of using the normal format - that usually contains a period. */ - spec->sysmis_as_spaces = (which_formats == WRITE - && var_is_numeric (var) - && (fmt_get_category (spec->format.type) - != FMT_CAT_BINARY)); - + const struct variable *var = vars[var_idx++]; + char *error = fmt_check_width_compat__ (f, var_get_name (var), + var_get_width (var)); + if (error) + { + lex_ofs_error (lexer, formats_start, formats_end, "%s", error); + free (error); + return false; + } + + struct prt_out_spec *spec = pool_alloc (trns->pool, sizeof *spec); + *spec = (struct prt_out_spec) { + .type = PRT_VAR, + .record = *record, + .first_column = *column, + .var = var, + .format = *f, + .add_space = add_space, + + /* This is a completely bizarre twist for compatibility: WRITE + outputs the system-missing value as a field filled with spaces, + instead of using the normal format that usually contains a + period. */ + .sysmis_as_spaces = (which_formats == WRITE + && var_is_numeric (var) + && (fmt_get_category (f->type) + != FMT_CAT_BINARY)), + }; ll_push_tail (&trns->specs, &spec->ll); *column += f->w + add_space; } - assert (var_idx == var_cnt); + assert (var_idx == n_vars); return true; } @@ -380,99 +433,113 @@ parse_variable_argument (struct lexer *lexer, const struct dictionary *dict, /* 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, 0); - tab_columns (t, TAB_COL_DOWN, 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")); - tab_dim (t, tab_natural_dimensions); - row = 1; - ll_for_each (spec, struct prt_out_spec, ll, &trns->specs) + 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 (t, 0, row, TAB_LEFT | TAB_FIX | TAT_PRINTF, "\"%.*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 (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); - 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 %d record to %s.", - "Writing %d records to %s.", trns->record_cnt), - trns->record_cnt, fh_get_name (fh)); - else - tab_title (t, ngettext ("Writing %d record.", - "Writing %d 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); } -/* 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; int record = 1; - struct prt_out_spec *spec; - ds_clear (&trns->line); - ds_put_char (&trns->line, ' '); - ll_for_each (spec, struct prt_out_spec, ll, &trns->specs) + u8_line_init (&line); + ll_for_each (spec, struct prt_out_spec, ll, &trns->specs) { - flush_records (trns, spec->record, &eject, &record); - - ds_set_length (&trns->line, spec->first_column, ' '); + int x0 = spec->first_column; + + 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); - char *output = ds_put_uninit (&trns->line, spec->format.w); + const union value *input = case_data (*c, spec->var); + int x1; + if (!spec->sysmis_as_spaces || input->f != SYSMIS) - data_out (input, &spec->format, output); + { + 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 - memset (output, ' ', 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_char (&trns->line, ' '); + *u8_line_reserve (&line, x1, x1 + 1, 1) = ' '; + } + else + { + const struct string *s = &spec->string; + + u8_line_put (&line, x0, x0 + spec->width, + ds_data (s), ds_length (s)); } - else - ds_put_substring (&trns->line, ds_ss (&spec->string)); } - 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; return TRNS_CONTINUE; @@ -483,41 +550,132 @@ print_trns_proc (void *trns_, struct ccase *c, casenumber case_num UNUSED) 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)++) + for (; target_record > *record; (*record)++) { - char *line = ds_cstr (&trns->line); - size_t length = ds_length (&trns->line); char leader = ' '; - - if (*eject) + + if (*eject) { *eject = false; if (trns->writer == NULL) - som_eject_page (); + output_item_submit (page_break_item_create ()); else leader = '1'; } - line[0] = leader; - + *u8_line_reserve (line, 0, 1, 1) = leader; + if (trns->writer == NULL) - tab_output_text (TAB_FIX | TAT_NOWRAP, &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) + { + s++; + len--; + } + + dfm_put_record_utf8 (trns->writer, s, len); + } + } +} + +/* Transformation, for output involving binary. */ + +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 { - if (!trns->include_prefix) + ds_put_substring (&line, ds_ss (&spec->string)); + if (0 != strcmp (trns->encoding, UTF8)) { - line++; - length--; + 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); } - dfm_put_record (trns->writer, line, length); } - - ds_truncate (&trns->line, 1); } + 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); + } +} + /* Frees TRNS. */ static bool print_trns_free (void *trns_) @@ -532,3 +690,15 @@ 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, +}; +