X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=cd5de5c33089a44678cbb29910e27e2358f68d89;hb=5729150f2c4a00caf688e7e3b514b10b1987e211;hp=0834e2ad2b7ca4b0eea757eb5de9b9ce4f05ad16;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index 0834e2ad2b..cd5de5c330 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. Written by Ben Pfaff . This program is free software; you can redistribute it and/or @@ -18,33 +18,36 @@ 02110-1301, USA. */ #include -#include "message.h" + #include #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "dictionary.h" -#include "lexer.h" -#include "message.h" -#include "magic.h" -#include "misc.h" -#include "htmlP.h" -#include "output.h" + +#include "intprops.h" #include "size_max.h" -#include "manager.h" -#include "table.h" -#include "variable.h" -#include "procedure.h" -#include "format.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) /* (headers) */ -#include "debug-print.h" - /* (specification) list (lst_): *variables=varlist("PV_NO_SCRATCH"); @@ -72,19 +75,19 @@ static struct cmd_list cmd; static int case_idx; /* Line buffer. */ -static char *line_buf; +static struct string line_buffer; /* TTY-style output functions. */ static unsigned n_lines_remaining (struct outp_driver *d); static unsigned n_chars_width (struct outp_driver *d); -static void write_line (struct outp_driver *d, char *s); +static void write_line (struct outp_driver *d, const char *s); /* Other functions. */ -static bool list_cases (struct ccase *, void *); +static bool list_cases (const struct ccase *, void *); static void determine_layout (void); static void clean_up (void); static void write_header (struct outp_driver *); -static void write_all_headers (void *); +static void write_all_headers (const struct ccase *, void *); /* Returns the number of text lines that can fit on the remainder of the page. */ @@ -108,15 +111,17 @@ n_chars_width (struct outp_driver *d) /* Writes the line S at the current position and advances to the next line. */ static void -write_line (struct outp_driver *d, char *s) +write_line (struct outp_driver *d, const char *s) { struct outp_text text; assert (d->cp_y + d->font_height <= d->length); - text.options = OUTP_T_JUST_LEFT; - ls_init (&text.s, s, strlen (s)); + text.font = OUTP_FIXED; + text.justification = OUTP_LEFT; + text.string = ss_cstr (s); text.x = d->cp_x; text.y = d->cp_y; + text.h = text.v = INT_MAX; d->class->text_draw (d, &text); d->cp_x = 0; d->cp_y += d->font_height; @@ -129,7 +134,7 @@ cmd_list (void) struct variable casenum_var; bool ok; - if (!parse_list (&cmd)) + if (!parse_list (&cmd, NULL)) return CMD_FAILURE; /* Fill in defaults. */ @@ -225,7 +230,7 @@ cmd_list (void) case_idx = 0; ok = procedure_with_splits (write_all_headers, list_cases, NULL, NULL); - free (line_buf); + ds_destroy(&line_buffer); clean_up (); @@ -235,10 +240,11 @@ cmd_list (void) /* Writes headers to all devices. This is done at the beginning of each SPLIT FILE group. */ static void -write_all_headers (void *aux UNUSED) +write_all_headers (const struct ccase *c, void *aux UNUSED) { struct outp_driver *d; + output_split_file_values (c); for (d = outp_drivers (NULL); d; d = outp_drivers (d)) { if (!d->class->special) @@ -250,25 +256,17 @@ write_all_headers (void *aux UNUSED) { struct html_driver_ext *x = d->ext; - assert (d->driver_open); - if (x->sequence_no == 0 && !d->class->open_page (d)) - { - msg (ME, _("Cannot open first page on HTML device %s."), - d->name); - return; - } - - fputs ("\n \n", x->file.file); + fputs ("
\n \n", x->file); { size_t i; for (i = 0; i < cmd.n_variables; i++) - fprintf (x->file.file, " \n", + fprintf (x->file, " \n", cmd.v_variables[i]->name); } - fputs (" \n", x->file.file); + fputs (" \n", x->file); } else assert (0); @@ -378,16 +376,14 @@ clean_up (void) free (prc->header); } free (prc); - - d->class->text_set_font_by_name (d, "PROP"); } else if (d->class == &html_class) { - if (d->driver_open && d->page_open) + if (d->page_open) { struct html_driver_ext *x = d->ext; - fputs ("
%s%s
\n", x->file.file); + fputs ("\n", x->file); } } else @@ -403,12 +399,9 @@ static void write_varname (struct outp_driver *d, char *string, int indent) { struct outp_text text; - - text.options = OUTP_T_JUST_LEFT; - ls_init (&text.s, string, strlen (string)); - d->class->text_metrics (d, &text); + int width; - if (d->cp_x + text.h > d->width) + if (d->cp_x + outp_string_width (d, string, OUTP_FIXED) > d->width) { d->cp_y += d->font_height; if (d->cp_y + d->font_height > d->length) @@ -416,10 +409,15 @@ write_varname (struct outp_driver *d, char *string, int indent) d->cp_x = indent; } + text.font = OUTP_FIXED; + text.justification = OUTP_LEFT; + text.string = ss_cstr (string); text.x = d->cp_x; text.y = d->cp_y; + text.h = text.v = INT_MAX; d->class->text_draw (d, &text); - d->cp_x += text.h; + d->class->text_metrics (d, &text, &width, NULL); + d->cp_x += width; } /* When we can't fit all the values across the page, we write out all @@ -434,24 +432,29 @@ write_fallback_headers (struct outp_driver *d) int line_number = 0; const char *Line = _("Line"); - char *leader = local_alloc (strlen (Line) + INT_DIGITS + 1 + 1); + char *leader = local_alloc (strlen (Line) + + INT_STRLEN_BOUND (line_number) + 1 + 1); while (index < cmd.n_variables) { struct outp_text text; + int leader_width; /* Ensure that there is enough room for a line of text. */ if (d->cp_y + d->font_height > d->length) outp_eject_page (d); /* The leader is a string like `Line 1: '. Write the leader. */ - sprintf(leader, "%s %d:", Line, ++line_number); - text.options = OUTP_T_JUST_LEFT; - ls_init (&text.s, leader, strlen (leader)); + sprintf (leader, "%s %d:", Line, ++line_number); + text.font = OUTP_FIXED; + text.justification = OUTP_LEFT; + text.string = ss_cstr (leader); text.x = 0; text.y = d->cp_y; + text.h = text.v = INT_MAX; d->class->text_draw (d, &text); - d->cp_x = text.h; + d->class->text_metrics (d, &text, &leader_width, NULL); + d->cp_x = leader_width; goto entry; do @@ -472,9 +475,10 @@ write_fallback_headers (struct outp_driver *d) } { - char varname[10]; - sprintf (varname, " %s", cmd.v_variables[index]->name); - write_varname (d, varname, text.h); + char varname[LONG_NAME_LEN + 2]; + snprintf (varname, sizeof varname, + " %s", cmd.v_variables[index]->name); + write_varname (d, varname, leader_width); } } while (++index < cmd.n_variables); @@ -525,8 +529,7 @@ determine_layout (void) assert (d->class->special == 0); - if (!d->page_open) - d->class->open_page (d); + outp_open_page (d); max_width = n_chars_width (d); largest_page_width = max (largest_page_width, max_width); @@ -545,7 +548,6 @@ determine_layout (void) if (width <= max_width) { prc->header_rows = 2; - d->class->text_set_font_by_name (d, "FIXED"); continue; } @@ -590,8 +592,6 @@ determine_layout (void) prc->header_rows = max (prc->header_rows, strlen (cmd.v_variables[column]->name)); prc->header_rows++; - - d->class->text_set_font_by_name (d, "FIXED"); continue; } @@ -602,15 +602,14 @@ determine_layout (void) d->cp_y += d->font_height; write_fallback_headers (d); d->cp_y += d->font_height; - d->class->text_set_font_by_name (d, "FIXED"); } - line_buf = xmalloc (max (1022, largest_page_width) + 2); + ds_init_empty (&line_buffer); } /* Writes case C to output. */ static bool -list_cases (struct ccase *c, void *aux UNUSED) +list_cases (const struct ccase *c, void *aux UNUSED) { struct outp_driver *d; @@ -625,10 +624,12 @@ list_cases (struct ccase *c, void *aux UNUSED) const struct list_ext *prc = d->prc; const int max_width = n_chars_width (d); int column; - int x = 0; if (!prc->header_rows) - x = nsprintf (line_buf, "%8s: ", cmd.v_variables[0]->name); + { + ds_put_format(&line_buffer, "%8s: ", cmd.v_variables[0]->name); + } + for (column = 0; column < cmd.n_variables; column++) { @@ -640,7 +641,8 @@ list_cases (struct ccase *c, void *aux UNUSED) else width = v->print.w; - if (width + x > max_width && x != 0) + if (width + ds_length(&line_buffer) > max_width && + ds_length(&line_buffer) != 0) { if (!n_lines_remaining (d)) { @@ -648,31 +650,34 @@ list_cases (struct ccase *c, void *aux UNUSED) write_header (d); } - line_buf[x] = 0; - write_line (d, line_buf); + write_line (d, ds_cstr (&line_buffer)); + ds_clear(&line_buffer); - x = 0; if (!prc->header_rows) - x = nsprintf (line_buf, "%8s: ", v->name); + { + ds_put_format (&line_buffer, "%8s: ", v->name); + } } if (width > v->print.w) { - memset(&line_buf[x], ' ', width - v->print.w); - x += width - v->print.w; + ds_put_char_multiple(&line_buffer, ' ', width - v->print.w); } if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1) - data_out (&line_buf[x], &v->print, case_data (c, v->fv)); + { + data_out (ds_put_uninit(&line_buffer, v->print.w), + &v->print, case_data (c, v->fv)); + } else { union value case_idx_value; case_idx_value.f = case_idx; - data_out (&line_buf[x], &v->print, &case_idx_value); + data_out (ds_put_uninit(&line_buffer,v->print.w), + &v->print, &case_idx_value); } - x += v->print.w; - - line_buf[x++] = ' '; + + ds_put_char(&line_buffer, ' '); } if (!n_lines_remaining (d)) @@ -681,20 +686,20 @@ list_cases (struct ccase *c, void *aux UNUSED) write_header (d); } - line_buf[x] = 0; - write_line (d, line_buf); + write_line (d, ds_cstr (&line_buffer)); + ds_clear(&line_buffer); } else if (d->class == &html_class) { struct html_driver_ext *x = d->ext; int column; - fputs (" \n", x->file.file); + fputs (" \n", x->file); for (column = 0; column < cmd.n_variables; column++) { struct variable *v = cmd.v_variables[column]; - char buf[41]; + char buf[256]; if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1) data_out (buf, &v->print, case_data (c, v->fv)); @@ -704,13 +709,13 @@ list_cases (struct ccase *c, void *aux UNUSED) case_idx_value.f = case_idx; data_out (buf, &v->print, &case_idx_value); } - buf[v->print.w] = 0; - fprintf (x->file.file, " %s\n", - &buf[strspn (buf, " ")]); + fputs (" ", x->file); + html_put_cell_contents (d, TAB_FIX, ss_buffer (buf, v->print.w)); + fputs ("\n", x->file); } - fputs (" \n", x->file.file); + fputs (" \n", x->file); } else assert (0);