/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011 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
#include <stdlib.h>
-#include <data/case.h>
-#include <data/data-out.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/dictionary/split-file.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <output/tab.h>
-
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/data-out.h"
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "output/pivot-table.h"
+
+#include "gl/xalloc.h"
#include "gettext.h"
+#define N_(msgid) msgid
#define _(msgid) gettext (msgid)
int
size_t n;
/* For now, ignore SEPARATE and LAYERED. */
- (void) ( lex_match_id (lexer, "SEPARATE") || lex_match_id (lexer, "LAYERED") );
+ (void) (lex_match_id (lexer, "SEPARATE") || lex_match_id (lexer, "LAYERED"));
lex_match (lexer, T_BY);
if (!parse_variables (lexer, dataset_dict (ds), &v, &n, PV_NO_DUPLICATE))
free (v);
}
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
}
/* Dumps out the values of all the split variables for the case C. */
output_split_file_values (const struct dataset *ds, const struct ccase *c)
{
const struct dictionary *dict = dataset_dict (ds);
- const struct variable *const *split;
- struct tab_table *t;
- size_t split_cnt;
- int i;
-
- split_cnt = dict_get_split_cnt (dict);
- if (split_cnt == 0)
+ size_t n_vars = dict_get_n_splits (dict);
+ if (n_vars == 0)
return;
- t = tab_create (3, split_cnt + 1);
- tab_vline (t, TAL_GAP, 1, 0, split_cnt);
- tab_vline (t, TAL_GAP, 2, 0, split_cnt);
- tab_text (t, 0, 0, TAB_NONE, _("Variable"));
- tab_text (t, 1, 0, TAB_LEFT, _("Value"));
- tab_text (t, 2, 0, TAB_LEFT, _("Label"));
- split = dict_get_split_vars (dict);
- for (i = 0; i < split_cnt; i++)
- {
- const struct variable *v = split[i];
- char *s;
- const char *val_lab;
- const struct fmt_spec *print = var_get_print_format (v);
-
- tab_text_format (t, 0, i + 1, TAB_LEFT, "%s", var_get_name (v));
+ struct pivot_table *table = pivot_table_create (N_("Split Values"));
+ pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Value"),
+ N_("Value"));
+ struct pivot_dimension *variables = pivot_dimension_create (
+ table, PIVOT_AXIS_ROW, N_("Variable"));
+ variables->root->show_label = true;
- s = data_out (case_data (c, v), dict_get_encoding (dict), print);
-
- tab_text_format (t, 1, i + 1, 0, "%.*s", print->w, s);
+ for (size_t i = 0; i < n_vars; i++)
+ {
+ const struct variable *v = dict_get_split_vars (dict)[i];
+ int row = pivot_category_create_leaf (variables->root,
+ pivot_value_new_variable (v));
- free (s);
-
- val_lab = var_lookup_value_label (v, case_data (c, v));
- if (val_lab)
- tab_text (t, 2, i + 1, TAB_LEFT, val_lab);
+ pivot_table_put2 (table, 0, row,
+ pivot_value_new_var_value (v, case_data (c, v)));
}
- tab_submit (t);
+
+ pivot_table_submit (table);
}