/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+ Copyright (C) 1997-9, 2000, 2006 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
02110-1301, USA. */
#include <config.h>
-#include <libpspp/message.h>
+
#include <stdio.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
+
+#include "intprops.h"
+#include "size_max.h"
#include <data/case.h>
-#include <language/command.h>
-#include <libpspp/compiler.h>
#include <data/dictionary.h>
-#include "intprops.h"
+#include <data/data-out.h>
+#include <data/format.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <output/htmlP.h>
-#include <output/output.h>
-#include "size_max.h"
#include <output/manager.h>
+#include <output/output.h>
#include <output/table.h>
-#include <data/variable.h>
-#include <procedure.h>
-#include <data/format.h>
+
+#include "minmax.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
/* (headers) */
-#include <libpspp/debug-print.h>
-
/* (specification)
list (lst_):
*variables=varlist("PV_NO_SCRATCH");
cases=:from n:first,"%s>0"/by n:step,"%s>0"/ *to n:last,"%s>0";
- format=numbering:numbered/!unnumbered,
- wrap:!wrap/single,
- weight:weight/!noweight.
+ +format=numbering:numbered/!unnumbered,
+ wrap:!wrap/single,
+ weight:weight/!noweight.
*/
/* (declarations) */
/* (functions) */
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 *, const struct dataset *);
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 *, const struct dataset*);
/* Returns the number of text lines that can fit on the remainder of
the page. */
/* 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.font = OUTP_FIXED;
text.justification = OUTP_LEFT;
- ls_init (&text.string, s, strlen (s));
+ text.string = ss_cstr (s);
text.x = d->cp_x;
text.y = d->cp_y;
text.h = text.v = INT_MAX;
/* Parses and executes the LIST procedure. */
int
-cmd_list (void)
+cmd_list (struct lexer *lexer, struct dataset *ds)
{
- struct variable casenum_var;
+ struct variable *casenum_var = NULL;
bool ok;
- if (!parse_list (&cmd))
+ if (!parse_list (lexer, ds, &cmd, NULL))
return CMD_FAILURE;
/* Fill in defaults. */
if (cmd.last == NOT_LONG)
cmd.last = LONG_MAX;
if (!cmd.sbc_variables)
- dict_get_vars (default_dict, &cmd.v_variables, &cmd.n_variables,
+ dict_get_vars (dataset_dict (ds), &cmd.v_variables, &cmd.n_variables,
(1u << DC_SYSTEM) | (1u << DC_SCRATCH));
if (cmd.n_variables == 0)
{
/* Weighting variable. */
if (cmd.weight == LST_WEIGHT)
{
- if (dict_get_weight (default_dict) != NULL)
+ if (dict_get_weight (dataset_dict (ds)) != NULL)
{
size_t i;
for (i = 0; i < cmd.n_variables; i++)
- if (cmd.v_variables[i] == dict_get_weight (default_dict))
+ if (cmd.v_variables[i] == dict_get_weight (dataset_dict (ds)))
break;
if (i >= cmd.n_variables)
{
cmd.v_variables = xnrealloc (cmd.v_variables, cmd.n_variables,
sizeof *cmd.v_variables);
cmd.v_variables[cmd.n_variables - 1]
- = dict_get_weight (default_dict);
+ = dict_get_weight (dataset_dict (ds));
}
}
else
if (cmd.numbering == LST_NUMBERED)
{
/* Initialize the case-number variable. */
- strcpy (casenum_var.name, "Case#");
- casenum_var.type = NUMERIC;
- casenum_var.fv = -1;
- casenum_var.print = make_output_format (FMT_F,
- (cmd.last == LONG_MAX
- ? 5 : intlog10 (cmd.last)), 0);
+ int width = cmd.last == LONG_MAX ? 5 : intlog10 (cmd.last);
+ struct fmt_spec format = fmt_for_output (FMT_F, width, 0);
+ casenum_var = var_create ("Case#", 0);
+ var_set_both_formats (casenum_var, &format);
/* Add the weight variable at the beginning of the variable list. */
cmd.n_variables++;
cmd.n_variables, sizeof *cmd.v_variables);
memmove (&cmd.v_variables[1], &cmd.v_variables[0],
(cmd.n_variables - 1) * sizeof *cmd.v_variables);
- cmd.v_variables[0] = &casenum_var;
+ cmd.v_variables[0] = casenum_var;
}
determine_layout ();
case_idx = 0;
- ok = procedure_with_splits (write_all_headers, list_cases, NULL, NULL);
- free (line_buf);
+ ok = procedure_with_splits (ds, write_all_headers, list_cases, NULL, NULL);
+ ds_destroy(&line_buffer);
clean_up ();
+ var_destroy (casenum_var);
+
return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE;
}
/* 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, const struct dataset *ds)
{
struct outp_driver *d;
+ output_split_file_values (ds, c);
for (d = outp_drivers (NULL); d; d = outp_drivers (d))
{
if (!d->class->special)
for (i = 0; i < cmd.n_variables; i++)
fprintf (x->file, " <TH><EM>%s</EM></TH>\n",
- cmd.v_variables[i]->name);
+ var_get_name (cmd.v_variables[i]));
}
fputs (" </TR>\n", x->file);
}
else
- assert (0);
+ NOT_REACHED ();
}
}
for (i = x = 0; i < prc->n_vertical; i++)
{
struct variable *v = cmd.v_variables[i];
+ const char *name = var_get_name (v);
+ size_t name_len = strlen (name);
+ const struct fmt_spec *print = var_get_print_format (v);
size_t j;
- memset (&prc->header[prc->header_rows - 1][x], '-', v->print.w);
- x += v->print.w - 1;
- for (j = 0; j < strlen (v->name); j++)
- prc->header[strlen (v->name) - j - 1][x] = v->name[j];
+ memset (&prc->header[prc->header_rows - 1][x], '-', print->w);
+ x += print->w - 1;
+ for (j = 0; j < name_len; j++)
+ prc->header[name_len - j - 1][x] = name[j];
x += 2;
}
for (; i < cmd.n_variables; i++)
{
struct variable *v = cmd.v_variables[i];
+ const char *name = var_get_name (v);
+ size_t name_len = strlen (name);
+ const struct fmt_spec *print = var_get_print_format (v);
memset (&prc->header[prc->header_rows - 1][x], '-',
- max (v->print.w, (int) strlen (v->name)));
- if ((int) strlen (v->name) < v->print.w)
- x += v->print.w - strlen (v->name);
- memcpy (&prc->header[0][x], v->name, strlen (v->name));
- x += strlen (v->name) + 1;
+ MAX (print->w, (int) name_len));
+ if ((int) name_len < print->w)
+ x += print->w - name_len;
+ memcpy (&prc->header[0][x], name, name_len);
+ x += name_len + 1;
}
/* Add null bytes. */
}
}
else
- assert (0);
+ NOT_REACHED ();
free (cmd.v_variables);
}
text.font = OUTP_FIXED;
text.justification = OUTP_LEFT;
- ls_init (&text.string, string, strlen (string));
+ text.string = ss_cstr (string);
text.x = d->cp_x;
text.y = d->cp_y;
text.h = text.v = INT_MAX;
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)
sprintf (leader, "%s %d:", Line, ++line_number);
text.font = OUTP_FIXED;
text.justification = OUTP_LEFT;
- ls_init (&text.string, leader, strlen (leader));
+ 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->class->text_metrics (d, &text, &d->cp_x, NULL);
+ d->class->text_metrics (d, &text, &leader_width, NULL);
+ d->cp_x = leader_width;
goto entry;
do
entry:
{
- int var_width = cmd.v_variables[index]->print.w;
+ int var_width = var_get_print_format (cmd.v_variables[index])->w;
if (width + var_width > max_width && width != 0)
{
width = 0;
}
{
- 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", var_get_name (cmd.v_variables[index]));
+ write_varname (d, varname, leader_width);
}
}
while (++index < cmd.n_variables);
outp_open_page (d);
max_width = n_chars_width (d);
- largest_page_width = max (largest_page_width, max_width);
+ largest_page_width = MAX (largest_page_width, max_width);
prc = d->prc = xmalloc (sizeof *prc);
prc->type = 0;
for (width = cmd.n_variables - 1, column = 0; column < cmd.n_variables; column++)
{
struct variable *v = cmd.v_variables[column];
- width += max (v->print.w, (int) strlen (v->name));
+ int fmt_width = var_get_print_format (v)->w;
+ int name_len = strlen (var_get_name (v));
+ width += MAX (fmt_width, name_len);
}
if (width <= max_width)
{
column++)
{
struct variable *v = cmd.v_variables[column];
- width += v->print.w;
- if (strlen (v->name) > height)
- height = strlen (v->name);
+ int fmt_width = var_get_print_format (v)->w;
+ size_t name_len = strlen (var_get_name (v));
+ width += fmt_width;
+ if (name_len > height)
+ height = name_len;
}
/* If it fit then we need to determine how many labels can be
for (column = cmd.n_variables; column-- != 0; )
{
struct variable *v = cmd.v_variables[column];
- int trial_width = (width - v->print.w
- + max (v->print.w, (int) strlen (v->name)));
-
+ int name_len = strlen (var_get_name (v));
+ int fmt_width = var_get_print_format (v)->w;
+ int trial_width = width - fmt_width + MAX (fmt_width, name_len);
if (trial_width > max_width)
{
prc->n_vertical = column + 1;
/* Finally determine the length of the headers. */
for (prc->header_rows = 0, column = 0;
column < prc->n_vertical;
- column++)
- prc->header_rows = max (prc->header_rows,
- strlen (cmd.v_variables[column]->name));
+ column++)
+ {
+ struct variable *var = cmd.v_variables[column];
+ size_t name_len = strlen (var_get_name (var));
+ prc->header_rows = MAX (prc->header_rows, name_len);
+ }
prc->header_rows++;
continue;
}
d->cp_y += d->font_height;
}
- 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, const struct dataset *ds)
{
struct outp_driver *d;
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: ",
+ var_get_name (cmd.v_variables[0]));
+ }
+
for (column = 0; column < cmd.n_variables; column++)
{
struct variable *v = cmd.v_variables[column];
+ const struct fmt_spec *print = var_get_print_format (v);
int width;
- if (prc->type == 0 && column >= prc->n_vertical)
- width = max ((int) strlen (v->name), v->print.w);
+ if (prc->type == 0 && column >= prc->n_vertical)
+ {
+ int name_len = strlen (var_get_name (v));
+ width = MAX (name_len, print->w);
+ }
else
- width = v->print.w;
+ width = 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))
{
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: ", var_get_name (v));
}
- if (width > v->print.w)
+ if (width > print->w)
+ ds_put_char_multiple(&line_buffer, ' ', width - print->w);
+
+ if (fmt_is_string (print->type)
+ || dict_contains_var (dataset_dict (ds), v))
{
- memset(&line_buf[x], ' ', width - v->print.w);
- x += width - v->print.w;
+ data_out (case_data (c, v), print,
+ ds_put_uninit (&line_buffer, 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));
else
{
union value case_idx_value;
case_idx_value.f = case_idx;
- data_out (&line_buf[x], &v->print, &case_idx_value);
+ data_out (&case_idx_value, print,
+ ds_put_uninit (&line_buffer,print->w));
}
- x += v->print.w;
-
- line_buf[x++] = ' ';
+
+ ds_put_char(&line_buffer, ' ');
}
if (!n_lines_remaining (d))
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)
{
for (column = 0; column < cmd.n_variables; column++)
{
struct variable *v = cmd.v_variables[column];
+ const struct fmt_spec *print = var_get_print_format (v);
char buf[256];
- struct fixed_string s;
- if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1)
- data_out (buf, &v->print, case_data (c, v->fv));
+ if (fmt_is_string (print->type)
+ || dict_contains_var (dataset_dict (ds), v))
+ data_out (case_data (c, v), print, buf);
else
{
union value case_idx_value;
case_idx_value.f = case_idx;
- data_out (buf, &v->print, &case_idx_value);
+ data_out (&case_idx_value, print, buf);
}
- ls_init (&s, buf, v->print.w);
fputs (" <TD>", x->file);
- html_put_cell_contents (d, TAB_FIX, &s);
+ html_put_cell_contents (d, TAB_FIX, ss_buffer (buf, print->w));
fputs ("</TD>\n", x->file);
}
fputs (" </TR>\n", x->file);
}
else
- assert (0);
+ NOT_REACHED ();
return true;
}
projects / pspp-builds.git / blobdiff