#include "size_max.h"
#include <data/case.h>
#include <data/dictionary.h>
+#include <data/data-out.h>
#include <data/format.h>
#include <data/procedure.h>
#include <data/variable.h>
static void write_line (struct outp_driver *d, const char *s);
/* Other functions. */
-static bool list_cases (const 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 (const struct ccase *, 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. */
/* Parses and executes the LIST procedure. */
int
-cmd_list (void)
+cmd_list (struct lexer *lexer, struct dataset *ds)
{
struct variable casenum_var;
bool ok;
- if (!parse_list (&cmd, NULL))
+ 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
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);
+ casenum_var.print = fmt_for_output (FMT_F,
+ (cmd.last == LONG_MAX
+ ? 5 : intlog10 (cmd.last)), 0);
/* Add the weight variable at the beginning of the variable list. */
cmd.n_variables++;
determine_layout ();
case_idx = 0;
- ok = procedure_with_splits (write_all_headers, list_cases, NULL, NULL);
+ ok = procedure_with_splits (ds, write_all_headers, list_cases, NULL, NULL);
ds_destroy(&line_buffer);
clean_up ();
/* Writes headers to all devices. This is done at the beginning of
each SPLIT FILE group. */
static void
-write_all_headers (const struct ccase *c, 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 (c);
+ output_split_file_values (ds, c);
for (d = outp_drivers (NULL); d; d = outp_drivers (d))
{
if (!d->class->special)
/* Writes case C to output. */
static bool
-list_cases (const struct ccase *c, void *aux UNUSED)
+list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds UNUSED)
{
struct outp_driver *d;
ds_put_char_multiple(&line_buffer, ' ', width - v->print.w);
}
- if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1)
+ if (fmt_is_string (v->print.type) || v->fv != -1)
{
- data_out (ds_put_uninit(&line_buffer, v->print.w),
- &v->print, case_data (c, v->fv));
+ data_out (case_data (c, v->fv), &v->print,
+ ds_put_uninit (&line_buffer, v->print.w));
}
else
{
union value case_idx_value;
case_idx_value.f = case_idx;
- data_out (ds_put_uninit(&line_buffer,v->print.w),
- &v->print, &case_idx_value);
+ data_out (&case_idx_value, &v->print,
+ ds_put_uninit (&line_buffer,v->print.w));
}
ds_put_char(&line_buffer, ' ');
struct variable *v = cmd.v_variables[column];
char buf[256];
- 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 (v->print.type) || v->fv != -1)
+ data_out (case_data (c, v->fv), &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, &v->print, buf);
}
fputs (" <TD>", x->file);