X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsys-file-info.c;h=68efb8ee7b6c6bbb6bb29fa81a5e8e1274e22ef3;hb=29917c4f5908454803e663d2ad78bca4bc35e805;hp=b9e0a85c48c27b972529069d40c7861a055d14e4;hpb=649c202d57d7d5d8bb87be5b72839cd56ca4ca0b;p=pspp
diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index b9e0a85c48..68efb8ee7b 100644
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -13,7 +13,6 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-
#include
#include
@@ -21,6 +20,7 @@
#include
#include
+#include "data/any-reader.h"
#include "data/attributes.h"
#include "data/casereader.h"
#include "data/dataset.h"
@@ -28,7 +28,6 @@
#include "data/file-handle-def.h"
#include "data/format.h"
#include "data/missing-values.h"
-#include "data/sys-file-reader.h"
#include "data/value-labels.h"
#include "data/variable.h"
#include "data/vector.h"
@@ -43,10 +42,10 @@
#include "libpspp/misc.h"
#include "libpspp/pool.h"
#include "libpspp/string-array.h"
-#include "output/tab.h"
-#include "output/text-item.h"
-#include "output/table-item.h"
+#include "output/pivot-table.h"
+#include "output/output-item.h"
+#include "gl/count-one-bits.h"
#include "gl/localcharset.h"
#include "gl/intprops.h"
#include "gl/minmax.h"
@@ -54,44 +53,63 @@
#include "gettext.h"
#define _(msgid) gettext (msgid)
+#define N_(msgid) (msgid)
/* Information to include in displaying a dictionary. */
-enum
+enum
{
- DF_DICT_INDEX = 1 << 0,
- DF_FORMATS = 1 << 1,
- DF_VALUE_LABELS = 1 << 2,
- DF_VARIABLE_LABELS = 1 << 3,
- DF_MISSING_VALUES = 1 << 4,
- DF_AT_ATTRIBUTES = 1 << 5, /* Attributes whose names begin with @. */
- DF_ATTRIBUTES = 1 << 6, /* All other attributes. */
- DF_MEASURE = 1 << 7,
- DF_ROLE = 1 << 8,
- DF_ALIGNMENT = 1 << 9,
- DF_WIDTH = 1 << 10,
- DF_ALL = (1 << 11) - 1
+ /* Variable table. */
+ DF_NAME = 1 << 0,
+ DF_POSITION = 1 << 1,
+ DF_LABEL = 1 << 2,
+ DF_MEASUREMENT_LEVEL = 1 << 3,
+ DF_ROLE = 1 << 4,
+ DF_WIDTH = 1 << 5,
+ DF_ALIGNMENT = 1 << 6,
+ DF_PRINT_FORMAT = 1 << 7,
+ DF_WRITE_FORMAT = 1 << 8,
+ DF_MISSING_VALUES = 1 << 9,
+#define DF_ALL_VARIABLE ((1 << 10) - 1)
+
+ /* Value labels table. */
+ DF_VALUE_LABELS = 1 << 10,
+
+ /* Attribute table. */
+ DF_AT_ATTRIBUTES = 1 << 11, /* Attributes whose names begin with @. */
+ DF_ATTRIBUTES = 1 << 12, /* All other attributes. */
};
-static unsigned int dict_display_mask (const struct dictionary *);
+static void display_variables (const struct variable **, size_t, int flags);
+static void display_value_labels (const struct variable **, size_t);
+static void display_attributes (const struct attrset *,
+ const struct variable **, size_t, int flags);
-static struct table *describe_variable (const struct variable *v, int flags);
+static void report_encodings (const struct file_handle *, struct pool *,
+ char **titles, bool *ids,
+ char **strings, size_t n_strings);
-static void report_encodings (const struct file_handle *,
- const struct sfm_reader *);
+static char *get_documents_as_string (const struct dictionary *);
+
+static void
+add_row (struct pivot_table *table, const char *attribute,
+ struct pivot_value *value)
+{
+ int row = pivot_category_create_leaf (table->dimensions[0]->root,
+ pivot_value_new_text (attribute));
+ if (value)
+ pivot_table_put1 (table, row, value);
+}
/* SYSFILE INFO utility. */
int
-cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED)
+cmd_sysfile_info (struct lexer *lexer, struct dataset *ds)
{
- struct sfm_reader *sfm_reader;
+ struct any_reader *any_reader;
struct file_handle *h;
struct dictionary *d;
- struct tab_table *t;
struct casereader *reader;
- struct sfm_read_info info;
+ struct any_read_info info;
char *encoding;
- struct table *table;
- int r, i;
h = NULL;
encoding = NULL;
@@ -130,114 +148,119 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED)
goto error;
}
- sfm_reader = sfm_open (h);
- if (sfm_reader == NULL)
- goto error;
+ any_reader = any_reader_open (h);
+ if (!any_reader)
+ {
+ free (encoding);
+ return CMD_FAILURE;
+ }
if (encoding && !strcasecmp (encoding, "detect"))
{
- report_encodings (h, sfm_reader);
+ char **titles, **strings;
+ struct pool *pool;
+ size_t n_strings;
+ bool *ids;
+
+ pool = pool_create ();
+ n_strings = any_reader_get_strings (any_reader, pool,
+ &titles, &ids, &strings);
+ any_reader_close (any_reader);
+
+ report_encodings (h, pool, titles, ids, strings, n_strings);
fh_unref (h);
+ pool_destroy (pool);
+ free (encoding);
+
return CMD_SUCCESS;
}
- reader = sfm_decode (sfm_reader, encoding, &d, &info);
+ reader = any_reader_decode (any_reader, encoding, &d, &info);
if (!reader)
goto error;
-
casereader_destroy (reader);
- t = tab_create (2, 11 + (info.product_ext != NULL));
- r = 0;
- tab_vline (t, TAL_GAP, 1, 0, 8);
+ struct pivot_table *table = pivot_table_create (N_("File Information"));
+ pivot_dimension_create (table, PIVOT_AXIS_ROW, N_("Attribute"));
- tab_text (t, 0, r, TAB_LEFT, _("File:"));
- tab_text (t, 1, r++, TAB_LEFT, fh_get_file_name (h));
+ add_row (table, N_("File"),
+ pivot_value_new_user_text (fh_get_file_name (h), -1));
- tab_text (t, 0, r, TAB_LEFT, _("Label:"));
- {
- const char *label = dict_get_label (d);
- if (label == NULL)
- label = _("No label.");
- tab_text (t, 1, r++, TAB_LEFT, label);
- }
+ const char *label = dict_get_label (d);
+ add_row (table, N_("Label"),
+ label ? pivot_value_new_user_text (label, -1) : NULL);
- tab_text (t, 0, r, TAB_LEFT, _("Created:"));
- tab_text_format (t, 1, r++, TAB_LEFT, "%s %s by %s",
- info.creation_date, info.creation_time, info.product);
+ add_row (table, N_("Created"),
+ pivot_value_new_user_text_nocopy (
+ xasprintf ("%s %s by %s", info.creation_date,
+ info.creation_time, info.product)));
if (info.product_ext)
- {
- tab_text (t, 0, r, TAB_LEFT, _("Product:"));
- tab_text (t, 1, r++, TAB_LEFT, info.product_ext);
- }
-
- tab_text (t, 0, r, TAB_LEFT, _("Integer Format:"));
- tab_text (t, 1, r++, TAB_LEFT,
- info.integer_format == INTEGER_MSB_FIRST ? _("Big Endian")
- : info.integer_format == INTEGER_LSB_FIRST ? _("Little Endian")
- : _("Unknown"));
-
- tab_text (t, 0, r, TAB_LEFT, _("Real Format:"));
- tab_text (t, 1, r++, TAB_LEFT,
- info.float_format == FLOAT_IEEE_DOUBLE_LE ? _("IEEE 754 LE.")
- : info.float_format == FLOAT_IEEE_DOUBLE_BE ? _("IEEE 754 BE.")
- : info.float_format == FLOAT_VAX_D ? _("VAX D.")
- : info.float_format == FLOAT_VAX_G ? _("VAX G.")
- : info.float_format == FLOAT_Z_LONG ? _("IBM 390 Hex Long.")
- : _("Unknown"));
-
- tab_text (t, 0, r, TAB_LEFT, _("Variables:"));
- tab_text_format (t, 1, r++, TAB_LEFT, "%zu", dict_get_var_cnt (d));
-
- tab_text (t, 0, r, TAB_LEFT, _("Cases:"));
- if (info.case_cnt == -1)
- tab_text (t, 1, r, TAB_LEFT, _("Unknown"));
- else
- tab_text_format (t, 1, r, TAB_LEFT, "%ld", (long int) info.case_cnt);
- r++;
-
- tab_text (t, 0, r, TAB_LEFT, _("Type:"));
- tab_text (t, 1, r++, TAB_LEFT, _("System File"));
-
- tab_text (t, 0, r, TAB_LEFT, _("Weight:"));
- {
- struct variable *weight_var = dict_get_weight (d);
- tab_text (t, 1, r++, TAB_LEFT,
- (weight_var != NULL
- ? var_get_name (weight_var) : _("Not weighted.")));
- }
-
- tab_text (t, 0, r, TAB_LEFT, _("Compression:"));
- tab_text_format (t, 1, r++, TAB_LEFT,
- info.compression == SFM_COMP_NONE ? _("None")
- : info.compression == SFM_COMP_SIMPLE ? "SAV"
- : "ZSAV");
-
- tab_text (t, 0, r, TAB_LEFT, _("Encoding:"));
- tab_text (t, 1, r++, TAB_LEFT, dict_get_encoding (d));
-
- tab_submit (t);
-
- t = tab_create (3, 1);
- tab_headers (t, 0, 0, 1, 0);
- tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Variable"));
- tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE, _("Description"));
- tab_text (t, 2, 0, TAB_LEFT | TAT_TITLE, _("Position"));
- tab_hline (t, TAL_2, 0, 2, 1);
+ add_row (table, N_("Product"),
+ pivot_value_new_user_text (info.product_ext, -1));
+
+ add_row (table, N_("Integer Format"),
+ pivot_value_new_text (
+ info.integer_format == INTEGER_MSB_FIRST ? N_("Big Endian")
+ : info.integer_format == INTEGER_LSB_FIRST ? N_("Little Endian")
+ : N_("Unknown")));
+
+ add_row (table, N_("Real Format"),
+ pivot_value_new_text (
+ info.float_format == FLOAT_IEEE_DOUBLE_LE ? N_("IEEE 754 LE.")
+ : info.float_format == FLOAT_IEEE_DOUBLE_BE ? N_("IEEE 754 BE.")
+ : info.float_format == FLOAT_VAX_D ? N_("VAX D.")
+ : info.float_format == FLOAT_VAX_G ? N_("VAX G.")
+ : info.float_format == FLOAT_Z_LONG ? N_("IBM 390 Hex Long.")
+ : N_("Unknown")));
+
+ add_row (table, N_("Variables"),
+ pivot_value_new_integer (dict_get_var_cnt (d)));
+
+ add_row (table, N_("Cases"),
+ (info.case_cnt == -1
+ ? pivot_value_new_text (N_("Unknown"))
+ : pivot_value_new_integer (info.case_cnt)));
+
+ add_row (table, N_("Type"),
+ pivot_value_new_text (info.klass->name));
+
+ struct variable *weight_var = dict_get_weight (d);
+ add_row (table, N_("Weight"),
+ (weight_var
+ ? pivot_value_new_variable (weight_var)
+ : pivot_value_new_text (N_("Not weighted"))));
+
+ add_row (table, N_("Compression"),
+ (info.compression == ANY_COMP_NONE
+ ? pivot_value_new_text (N_("None"))
+ : pivot_value_new_user_text (
+ info.compression == ANY_COMP_SIMPLE ? "SAV" : "ZSAV", -1)));
+
+ add_row (table, N_("Encoding"),
+ pivot_value_new_user_text (dict_get_encoding (d), -1));
+
+ if (dict_get_document_line_cnt (d) > 0)
+ add_row (table, N_("Documents"),
+ pivot_value_new_user_text_nocopy (get_documents_as_string (d)));
+
+ pivot_table_submit (table);
- table = &t->table;
- for (i = 0; i < dict_get_var_cnt (d); i++)
- table = table_vpaste (table,
- describe_variable (dict_get_var (d, i),
- DF_ALL & ~DF_AT_ATTRIBUTES));
-
- table_item_submit (table_item_create (table, NULL /* XXX */));
+ size_t n_vars = dict_get_var_cnt (d);
+ const struct variable **vars = xnmalloc (n_vars, sizeof *vars);
+ for (size_t i = 0; i < dict_get_var_cnt (d); i++)
+ vars[i] = dict_get_var (d, i);
+ display_variables (vars, n_vars, DF_ALL_VARIABLE);
+ display_value_labels (vars, n_vars);
+ display_attributes (dict_get_attributes (dataset_dict (ds)),
+ vars, n_vars, DF_ATTRIBUTES);
+ free (vars);
- dict_destroy (d);
+ dict_unref (d);
fh_unref (h);
- sfm_read_info_destroy (&info);
+ free (encoding);
+ any_read_info_destroy (&info);
return CMD_SUCCESS;
error:
@@ -250,9 +273,7 @@ error:
static void display_macros (void);
static void display_documents (const struct dictionary *dict);
-static void display_variables (const struct variable **, size_t, int);
static void display_vectors (const struct dictionary *dict, int sorted);
-static void display_data_file_attributes (struct attrset *, int flags);
int
cmd_display (struct lexer *lexer, struct dataset *ds)
@@ -272,12 +293,16 @@ cmd_display (struct lexer *lexer, struct dataset *ds)
{
if (!lex_force_match_id (lexer, "LABEL"))
return CMD_FAILURE;
- if (dict_get_label (dataset_dict (ds)) == NULL)
- tab_output_text (TAB_LEFT,
- _("The active dataset does not have a file label."));
- else
- tab_output_text_format (TAB_LEFT, _("File label: %s"),
- dict_get_label (dataset_dict (ds)));
+
+ const char *label = dict_get_label (dataset_dict (ds));
+
+ struct pivot_table *table = pivot_table_create (N_("File Label"));
+ pivot_dimension_create (table, PIVOT_AXIS_ROW, N_("Label"),
+ N_("Label"));
+ pivot_table_put1 (table, 0,
+ (label ? pivot_value_new_user_text (label, -1)
+ : pivot_value_new_text (N_("(none)"))));
+ pivot_table_submit (table);
}
else
{
@@ -290,29 +315,32 @@ cmd_display (struct lexer *lexer, struct dataset *ds)
display_vectors (dataset_dict(ds), sorted);
return CMD_SUCCESS;
}
- else if (lex_match_id (lexer, "SCRATCH"))
+ else if (lex_match_id (lexer, "SCRATCH"))
{
dict_get_vars (dataset_dict (ds), &vl, &n, DC_ORDINARY);
- flags = 0;
+ flags = DF_NAME;
}
- else
+ else
{
- struct subcommand
+ struct subcommand
{
const char *name;
int flags;
};
- static const struct subcommand subcommands[] =
+ static const struct subcommand subcommands[] =
{
{"@ATTRIBUTES", DF_ATTRIBUTES | DF_AT_ATTRIBUTES},
{"ATTRIBUTES", DF_ATTRIBUTES},
- {"DICTIONARY", DF_ALL & ~DF_AT_ATTRIBUTES},
- {"INDEX", DF_DICT_INDEX},
- {"LABELS", DF_DICT_INDEX | DF_VARIABLE_LABELS},
- {"NAMES", 0},
- {"VARIABLES",
- DF_DICT_INDEX | DF_FORMATS | DF_MISSING_VALUES
- | DF_MEASURE | DF_ROLE | DF_ALIGNMENT | DF_WIDTH},
+ {"DICTIONARY", (DF_NAME | DF_POSITION | DF_LABEL
+ | DF_MEASUREMENT_LEVEL | DF_ROLE | DF_WIDTH
+ | DF_ALIGNMENT | DF_PRINT_FORMAT
+ | DF_WRITE_FORMAT | DF_MISSING_VALUES
+ | DF_VALUE_LABELS)},
+ {"INDEX", DF_NAME | DF_POSITION},
+ {"LABELS", DF_NAME | DF_POSITION | DF_LABEL},
+ {"NAMES", DF_NAME},
+ {"VARIABLES", (DF_NAME | DF_POSITION | DF_PRINT_FORMAT
+ | DF_WRITE_FORMAT | DF_MISSING_VALUES)},
{NULL, 0},
};
const struct subcommand *sbc;
@@ -322,7 +350,7 @@ cmd_display (struct lexer *lexer, struct dataset *ds)
for (sbc = subcommands; sbc->name != NULL; sbc++)
if (lex_match_id (lexer, sbc->name))
{
- flags = sbc->flags & dict_display_mask (dict);
+ flags = sbc->flags;
break;
}
@@ -342,21 +370,28 @@ cmd_display (struct lexer *lexer, struct dataset *ds)
dict_get_vars (dict, &vl, &n, 0);
}
- if (n > 0)
+ if (n > 0)
{
- sort (vl, n, sizeof *vl,
- (sorted
- ? compare_var_ptrs_by_name
- : compare_var_ptrs_by_dict_index), NULL);
- display_variables (vl, n, flags);
+ sort (vl, n, sizeof *vl, (sorted
+ ? compare_var_ptrs_by_name
+ : compare_var_ptrs_by_dict_index), NULL);
+
+ int variable_flags = flags & DF_ALL_VARIABLE;
+ if (variable_flags)
+ display_variables (vl, n, variable_flags);
+
+ if (flags & DF_VALUE_LABELS)
+ display_value_labels (vl, n);
+
+ int attribute_flags = flags & (DF_ATTRIBUTES | DF_AT_ATTRIBUTES);
+ if (attribute_flags)
+ display_attributes (dict_get_attributes (dataset_dict (ds)),
+ vl, n, attribute_flags);
}
else
msg (SW, _("No variables to display."));
- free (vl);
- if (flags & (DF_ATTRIBUTES | DF_AT_ATTRIBUTES))
- display_data_file_attributes (dict_get_attributes (dataset_dict (ds)),
- flags);
+ free (vl);
}
return CMD_SUCCESS;
@@ -365,324 +400,314 @@ cmd_display (struct lexer *lexer, struct dataset *ds)
static void
display_macros (void)
{
- tab_output_text (TAB_LEFT, _("Macros not supported."));
+ msg (SW, _("Macros not supported."));
}
-static void
-display_documents (const struct dictionary *dict)
+static char *
+get_documents_as_string (const struct dictionary *dict)
{
const struct string_array *documents = dict_get_documents (dict);
-
- if (string_array_is_empty (documents))
- tab_output_text (TAB_LEFT, _("The active dataset dictionary does not "
- "contain any documents."));
- else
+ struct string s = DS_EMPTY_INITIALIZER;
+ for (size_t i = 0; i < documents->n; i++)
{
- size_t i;
-
- tab_output_text (TAB_LEFT | TAT_TITLE,
- _("Documents in the active dataset:"));
- for (i = 0; i < dict_get_document_line_cnt (dict); i++)
- tab_output_text (TAB_LEFT | TAB_FIX, dict_get_document_line (dict, i));
+ if (i)
+ ds_put_byte (&s, '\n');
+ ds_put_cstr (&s, documents->strings[i]);
}
+ return ds_steal_cstr (&s);
}
-static int
-count_columns (int flags)
+static void
+display_documents (const struct dictionary *dict)
{
- int nc = 1;
- if (flags & ~DF_DICT_INDEX)
- nc++;
- if (flags & DF_DICT_INDEX)
- nc++;
+ struct pivot_table *table = pivot_table_create (N_("Documents"));
+ struct pivot_dimension *d = pivot_dimension_create (
+ table, PIVOT_AXIS_COLUMN, N_("Documents"), N_("Document"));
+ d->hide_all_labels = true;
- return nc;
-}
+ if (!dict_get_documents (dict)->n)
+ pivot_table_put1 (table, 0, pivot_value_new_text (N_("(none)")));
+ else
+ {
+ char *docs = get_documents_as_string (dict);
+ pivot_table_put1 (table, 0, pivot_value_new_user_text_nocopy (docs));
+ }
-static int
-position_column (int flags)
-{
- int pc = 1;
- if (flags & ~DF_DICT_INDEX)
- pc++;
- return pc;
+ pivot_table_submit (table);
}
static void
display_variables (const struct variable **vl, size_t n, int flags)
{
- struct tab_table *t;
- struct table *table;
- size_t i;
- int nc;
-
- nc = count_columns (flags);
- t = tab_create (nc, 1);
- tab_headers (t, 0, 0, 1, 0);
- tab_hline (t, TAL_2, 0, nc - 1, 1);
- tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Variable"));
- if (flags & ~DF_DICT_INDEX)
- tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE,
- (flags & ~(DF_DICT_INDEX | DF_VARIABLE_LABELS)
- ? _("Description") : _("Label")));
- if (flags & DF_DICT_INDEX)
- tab_text (t, position_column (flags), 0, TAB_LEFT | TAT_TITLE,
- _("Position"));
-
- table = &t->table;
- for (i = 0; i < n; i++)
- table = table_vpaste (table, describe_variable (vl[i], flags));
+ struct pivot_table *table = pivot_table_create (N_("Variables"));
+
+ struct pivot_dimension *attributes = pivot_dimension_create (
+ table, PIVOT_AXIS_COLUMN, N_("Attributes"));
-#if 0
- tab_hline (t, flags & ~DF_DICT_INDEX ? TAL_2 : TAL_1, 0, nc - 1, 1);
- if (flags)
+ struct heading
{
- tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, nc - 1, r - 1);
- tab_vline (t, TAL_1, 1, 0, r - 1);
- }
- if (flags & ~DF_DICT_INDEX)
- tab_vline (t, TAL_1, nc - 1, 0, r - 1);
-#endif
- table_item_submit (table_item_create (table, NULL /* XXX */));
-}
-
-static bool
-is_at_name (const char *name)
-{
- return name[0] == '@' || (name[0] == '$' && name[1] == '@');
-}
+ int flag;
+ const char *title;
+ };
+ static const struct heading headings[] = {
+ { DF_POSITION, N_("Position") },
+ { DF_LABEL, N_("Label") },
+ { DF_MEASUREMENT_LEVEL, N_("Measurement Level") },
+ { DF_ROLE, N_("Role") },
+ { DF_WIDTH, N_("Width") },
+ { DF_ALIGNMENT, N_("Alignment") },
+ { DF_PRINT_FORMAT, N_("Print Format") },
+ { DF_WRITE_FORMAT, N_("Write Format") },
+ { DF_MISSING_VALUES, N_("Missing Values") },
+ };
+ for (size_t i = 0; i < sizeof headings / sizeof *headings; i++)
+ if (flags & headings[i].flag)
+ pivot_category_create_leaf (attributes->root,
+ pivot_value_new_text (headings[i].title));
-static size_t
-count_attributes (const struct attrset *set, int flags)
-{
- struct attrset_iterator i;
- struct attribute *attr;
- size_t n_attrs;
-
- n_attrs = 0;
- for (attr = attrset_first (set, &i); attr != NULL;
- attr = attrset_next (set, &i))
- if (flags & DF_AT_ATTRIBUTES || !is_at_name (attribute_get_name (attr)))
- n_attrs += attribute_get_n_values (attr);
- return n_attrs;
-}
+ struct pivot_dimension *names = pivot_dimension_create (
+ table, PIVOT_AXIS_ROW, N_("Name"));
+ names->root->show_label = true;
-static struct table *
-describe_attributes (const struct attrset *set, int flags)
-{
- struct attribute **attrs;
- struct tab_table *t;
- size_t n_attrs;
- size_t i;
- int r = 1;
-
- t = tab_create (2, 1 + count_attributes (set, flags));
- tab_headers (t, 0, 0, 1, 0);
- tab_box (t, TAL_1, TAL_1, -1, TAL_1, 0, 0, tab_nc (t) - 1, tab_nr (t) - 1);
- tab_hline (t, TAL_1, 0, 1, 1);
- tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Attribute"));
- tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE, _("Value"));
-
- n_attrs = attrset_count (set);
- attrs = attrset_sorted (set);
- for (i = 0; i < n_attrs; i++)
+ for (size_t i = 0; i < n; i++)
{
- const struct attribute *attr = attrs[i];
- const char *name = attribute_get_name (attr);
- size_t n_values;
- size_t j;
+ const struct variable *v = vl[i];
- if (!(flags & DF_AT_ATTRIBUTES) && is_at_name (name))
- continue;
+ struct pivot_value *name = pivot_value_new_variable (v);
+ name->variable.show = SETTINGS_VALUE_SHOW_VALUE;
+ int row = pivot_category_create_leaf (names->root, name);
- n_values = attribute_get_n_values (attr);
- for (j = 0; j < n_values; j++)
+ int x = 0;
+ if (flags & DF_POSITION)
+ pivot_table_put2 (table, x++, row, pivot_value_new_integer (
+ var_get_dict_index (v) + 1));
+
+ if (flags & DF_LABEL)
{
- if (n_values > 1)
- tab_text_format (t, 0, r, TAB_LEFT, "%s[%zu]", name, j + 1);
- else
- tab_text (t, 0, r, TAB_LEFT, name);
- tab_text (t, 1, r, TAB_LEFT, attribute_get_value (attr, j));
- r++;
+ const char *label = var_get_label (v);
+ if (label)
+ pivot_table_put2 (table, x, row,
+ pivot_value_new_user_text (label, -1));
+ x++;
}
- }
- free (attrs);
- return &t->table;
-}
+ if (flags & DF_MEASUREMENT_LEVEL)
+ pivot_table_put2 (
+ table, x++, row,
+ pivot_value_new_text (measure_to_string (var_get_measure (v))));
-static void
-display_data_file_attributes (struct attrset *set, int flags)
-{
- if (count_attributes (set, flags))
- table_item_submit (table_item_create (describe_attributes (set, flags),
- _("Custom data file attributes.")));
-}
+ if (flags & DF_ROLE)
+ pivot_table_put2 (
+ table, x++, row,
+ pivot_value_new_text (var_role_to_string (var_get_role (v))));
-static struct table *
-describe_value_labels (const struct variable *var)
-{
- const struct val_labs *val_labs = var_get_value_labels (var);
- size_t n_labels = val_labs_count (val_labs);
- const struct val_lab **labels;
- struct tab_table *t;
- size_t i;
+ if (flags & DF_WIDTH)
+ pivot_table_put2 (
+ table, x++, row,
+ pivot_value_new_integer (var_get_display_width (v)));
- t = tab_create (2, n_labels + 1);
- tab_box (t, TAL_1, TAL_1, -1, TAL_1, 0, 0, tab_nc (t) - 1, tab_nr (t) - 1);
+ if (flags & DF_ALIGNMENT)
+ pivot_table_put2 (
+ table, x++, row,
+ pivot_value_new_text (alignment_to_string (
+ var_get_alignment (v))));
- tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Value"));
- tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE, _("Label"));
+ if (flags & DF_PRINT_FORMAT)
+ {
+ const struct fmt_spec *print = var_get_print_format (v);
+ char s[FMT_STRING_LEN_MAX + 1];
- tab_hline (t, TAL_1, 0, 1, 1);
- tab_vline (t, TAL_1, 1, 0, n_labels);
+ pivot_table_put2 (
+ table, x++, row,
+ pivot_value_new_user_text (fmt_to_string (print, s), -1));
+ }
- labels = val_labs_sorted (val_labs);
- for (i = 0; i < n_labels; i++)
- {
- const struct val_lab *vl = labels[i];
+ if (flags & DF_WRITE_FORMAT)
+ {
+ const struct fmt_spec *write = var_get_write_format (v);
+ char s[FMT_STRING_LEN_MAX + 1];
- tab_value (t, 0, i + 1, TAB_NONE, &vl->value, var, NULL);
- tab_text (t, 1, i + 1, TAB_LEFT, val_lab_get_escaped_label (vl));
+ pivot_table_put2 (
+ table, x++, row,
+ pivot_value_new_user_text (fmt_to_string (write, s), -1));
+ }
+
+ if (flags & DF_MISSING_VALUES)
+ {
+ char *s = mv_to_string (var_get_missing_values (v),
+ var_get_encoding (v));
+ if (s)
+ pivot_table_put2 (
+ table, x, row,
+ pivot_value_new_user_text_nocopy (s));
+
+ x++;
+ }
}
- free (labels);
- return &t->table;
+ pivot_table_submit (table);
}
-/* Puts a description of variable V into table T starting at row
- R. The variable will be described in the format given by
- FLAGS. Returns the next row available for use in the
- table. */
-static struct table *
-describe_variable (const struct variable *v, int flags)
+static bool
+any_value_labels (const struct variable **vars, size_t n_vars)
{
- struct table *table;
- struct string s;
-
- ds_init_empty (&s);
-
- /* Variable label. */
- if (flags & DF_VARIABLE_LABELS && var_has_label (v))
- {
- if (flags & ~(DF_DICT_INDEX | DF_VARIABLE_LABELS))
- ds_put_format (&s, _("Label: %s\n"), var_get_label (v));
- else
- ds_put_format (&s, "%s\n", var_get_label (v));
- }
-
- /* Print/write format, or print and write formats. */
- if (flags & DF_FORMATS)
- {
- const struct fmt_spec *print = var_get_print_format (v);
- const struct fmt_spec *write = var_get_write_format (v);
- char str[FMT_STRING_LEN_MAX + 1];
-
- if (fmt_equal (print, write))
- ds_put_format (&s, _("Format: %s\n"), fmt_to_string (print, str));
- else
- {
- ds_put_format (&s, _("Print Format: %s\n"),
- fmt_to_string (print, str));
- ds_put_format (&s, _("Write Format: %s\n"),
- fmt_to_string (write, str));
- }
- }
+ for (size_t i = 0; i < n_vars; i++)
+ if (val_labs_count (var_get_value_labels (vars[i])))
+ return true;
+ return false;
+}
- /* Measurement level, role, display width, alignment. */
- if (flags & DF_MEASURE)
- ds_put_format (&s, _("Measure: %s\n"),
- measure_to_string (var_get_measure (v)));
+static void
+display_value_labels (const struct variable **vars, size_t n_vars)
+{
+ if (!any_value_labels (vars, n_vars))
+ return;
- if (flags & DF_ROLE)
- ds_put_format (&s, _("Role: %s\n"), var_role_to_string (var_get_role (v)));
+ struct pivot_table *table = pivot_table_create (N_("Value Labels"));
+ pivot_dimension_create (table, PIVOT_AXIS_COLUMN,
+ N_("Label"), N_("Label"));
- if (flags & DF_ALIGNMENT)
- ds_put_format (&s, _("Display Alignment: %s\n"),
- alignment_to_string (var_get_alignment (v)));
+ struct pivot_dimension *values = pivot_dimension_create (
+ table, PIVOT_AXIS_ROW, N_("Variable Value"));
+ values->root->show_label = true;
- if (flags & DF_WIDTH)
- ds_put_format (&s, _("Display Width: %d\n"), var_get_display_width (v));
+ struct pivot_footnote *missing_footnote = pivot_table_create_footnote (
+ table, pivot_value_new_text (N_("User-missing value")));
- /* Missing values if any. */
- if (flags & DF_MISSING_VALUES && var_has_missing_values (v))
+ for (size_t i = 0; i < n_vars; i++)
{
- const struct missing_values *mv = var_get_missing_values (v);
- int cnt = 0;
- int i;
+ const struct val_labs *val_labs = var_get_value_labels (vars[i]);
+ size_t n_labels = val_labs_count (val_labs);
+ if (!n_labels)
+ continue;
- ds_put_cstr (&s, _("Missing Values: "));
+ struct pivot_category *group = pivot_category_create_group__ (
+ values->root, pivot_value_new_variable (vars[i]));
- if (mv_has_range (mv))
+ const struct val_lab **labels = val_labs_sorted (val_labs);
+ for (size_t j = 0; j < n_labels; j++)
{
- double x, y;
- mv_get_range (mv, &x, &y);
- if (x == LOWEST)
- ds_put_format (&s, "LOWEST THRU %.*g", DBL_DIG + 1, y);
- else if (y == HIGHEST)
- ds_put_format (&s, "%.*g THRU HIGHEST", DBL_DIG + 1, x);
+ const struct val_lab *vl = labels[j];
+
+ struct pivot_value *value = pivot_value_new_var_value (
+ vars[i], &vl->value);
+ if (value->type == PIVOT_VALUE_NUMERIC)
+ value->numeric.show = SETTINGS_VALUE_SHOW_VALUE;
else
- ds_put_format (&s, "%.*g THRU %.*g",
- DBL_DIG + 1, x,
- DBL_DIG + 1, y);
- cnt++;
- }
- for (i = 0; i < mv_n_values (mv); i++)
- {
- const union value *value = mv_get_value (mv, i);
- if (cnt++ > 0)
- ds_put_cstr (&s, "; ");
- if (var_is_numeric (v))
- ds_put_format (&s, "%.*g", DBL_DIG + 1, value->f);
+ value->string.show = SETTINGS_VALUE_SHOW_VALUE;
+ if (var_is_value_missing (vars[i], &vl->value, MV_USER))
+ pivot_value_add_footnote (value, missing_footnote);
+ int row = pivot_category_create_leaf (group, value);
+
+ struct pivot_value *label = pivot_value_new_var_value (
+ vars[i], &vl->value);
+ char *escaped_label = xstrdup (val_lab_get_escaped_label (vl));
+ if (label->type == PIVOT_VALUE_NUMERIC)
+ {
+ free (label->numeric.value_label);
+ label->numeric.value_label = escaped_label;
+ label->numeric.show = SETTINGS_VALUE_SHOW_LABEL;
+ }
else
{
- int width = var_get_width (v);
- int mv_width = MIN (width, MV_MAX_STRING);
-
- ds_put_byte (&s, '"');
- memcpy (ds_put_uninit (&s, mv_width),
- value_str (value, width), mv_width);
- ds_put_byte (&s, '"');
+ free (label->string.value_label);
+ label->string.value_label = escaped_label;
+ label->string.show = SETTINGS_VALUE_SHOW_LABEL;
}
+ pivot_table_put2 (table, 0, row, label);
}
- ds_put_byte (&s, '\n');
+ free (labels);
}
+ pivot_table_submit (table);
+}
+
+static bool
+is_at_name (const char *name)
+{
+ return name[0] == '@' || (name[0] == '$' && name[1] == '@');
+}
- ds_chomp_byte (&s, '\n');
-
- table = (ds_is_empty (&s)
- ? NULL
- : table_from_string (TAB_LEFT, ds_cstr (&s)));
- ds_destroy (&s);
+static size_t
+count_attributes (const struct attrset *set, int flags)
+{
+ struct attrset_iterator i;
+ struct attribute *attr;
+ size_t n_attrs;
- /* Value labels. */
- if (flags & DF_VALUE_LABELS && var_has_value_labels (v))
- table = table_vpaste (table, table_create_nested (describe_value_labels (v)));
+ n_attrs = 0;
+ for (attr = attrset_first (set, &i); attr != NULL;
+ attr = attrset_next (set, &i))
+ if (flags & DF_AT_ATTRIBUTES || !is_at_name (attribute_get_name (attr)))
+ n_attrs += attribute_get_n_values (attr);
+ return n_attrs;
+}
- if (flags & (DF_ATTRIBUTES | DF_AT_ATTRIBUTES))
+static void
+display_attrset (struct pivot_table *table, struct pivot_value *set_name,
+ const struct attrset *set, int flags)
+{
+ size_t n_total = count_attributes (set, flags);
+ if (!n_total)
{
- struct attrset *attrs = var_get_attributes (v);
-
- if (count_attributes (attrs, flags))
- table = table_vpaste (
- table, table_create_nested (describe_attributes (attrs, flags)));
+ pivot_value_destroy (set_name);
+ return;
}
- if (table == NULL)
- table = table_from_string (TAB_LEFT, "");
+ struct pivot_category *group = pivot_category_create_group__ (
+ table->dimensions[1]->root, set_name);
- table = table_hpaste (table_from_string (0, var_get_name (v)),
- table_stomp (table));
- if (flags & DF_DICT_INDEX)
+ size_t n_attrs = attrset_count (set);
+ struct attribute **attrs = attrset_sorted (set);
+ for (size_t i = 0; i < n_attrs; i++)
{
- char s[INT_BUFSIZE_BOUND (size_t)];
+ const struct attribute *attr = attrs[i];
+ const char *name = attribute_get_name (attr);
+
+ if (!(flags & DF_AT_ATTRIBUTES) && is_at_name (name))
+ continue;
- sprintf (s, "%zu", var_get_dict_index (v) + 1);
- table = table_hpaste (table, table_from_string (0, s));
+ size_t n_values = attribute_get_n_values (attr);
+ for (size_t j = 0; j < n_values; j++)
+ {
+ int row = pivot_category_create_leaf (
+ group,
+ (n_values > 1
+ ? pivot_value_new_user_text_nocopy (xasprintf (
+ "%s[%zu]", name, j + 1))
+ : pivot_value_new_user_text (name, -1)));
+ pivot_table_put2 (table, 0, row,
+ pivot_value_new_user_text (
+ attribute_get_value (attr, j), -1));
+ }
}
+ free (attrs);
+}
+
+static void
+display_attributes (const struct attrset *dict_attrset,
+ const struct variable **vars, size_t n_vars, int flags)
+{
+ struct pivot_table *table = pivot_table_create (
+ N_("Variable and Dataset Attributes"));
+
+ pivot_dimension_create (table, PIVOT_AXIS_COLUMN,
+ N_("Value"), N_("Value"));
+
+ struct pivot_dimension *variables = pivot_dimension_create (
+ table, PIVOT_AXIS_ROW, N_("Variable and Name"));
+ variables->root->show_label = true;
- return table;
+ display_attrset (table, pivot_value_new_text (N_("(dataset)")),
+ dict_attrset, flags);
+ for (size_t i = 0; i < n_vars; i++)
+ display_attrset (table, pivot_value_new_variable (vars[i]),
+ var_get_attributes (vars[i]), flags);
+
+ if (pivot_table_is_empty (table))
+ pivot_table_unref (table);
+ else
+ pivot_table_submit (table);
}
/* Display a list of vectors. If SORTED is nonzero then they are
@@ -690,66 +715,52 @@ describe_variable (const struct variable *v, int flags)
static void
display_vectors (const struct dictionary *dict, int sorted)
{
- const struct vector **vl;
- int i;
- struct tab_table *t;
- size_t nvec;
- size_t nrow;
- size_t row;
-
- nvec = dict_get_vector_cnt (dict);
- if (nvec == 0)
+ size_t n_vectors = dict_get_vector_cnt (dict);
+ if (n_vectors == 0)
{
msg (SW, _("No vectors defined."));
return;
}
- vl = xnmalloc (nvec, sizeof *vl);
- nrow = 0;
- for (i = 0; i < nvec; i++)
- {
- vl[i] = dict_get_vector (dict, i);
- nrow += vector_get_var_cnt (vl[i]);
- }
+ const struct vector **vectors = xnmalloc (n_vectors, sizeof *vectors);
+ for (size_t i = 0; i < n_vectors; i++)
+ vectors[i] = dict_get_vector (dict, i);
if (sorted)
- qsort (vl, nvec, sizeof *vl, compare_vector_ptrs_by_name);
-
- t = tab_create (4, nrow + 1);
- tab_headers (t, 0, 0, 1, 0);
- tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, 3, nrow);
- tab_box (t, -1, -1, -1, TAL_1, 0, 0, 3, nrow);
- tab_hline (t, TAL_2, 0, 3, 1);
- tab_text (t, 0, 0, TAT_TITLE | TAB_LEFT, _("Vector"));
- tab_text (t, 1, 0, TAT_TITLE | TAB_LEFT, _("Position"));
- tab_text (t, 2, 0, TAT_TITLE | TAB_LEFT, _("Variable"));
- tab_text (t, 3, 0, TAT_TITLE | TAB_LEFT, _("Print Format"));
-
- row = 1;
- for (i = 0; i < nvec; i++)
+ qsort (vectors, n_vectors, sizeof *vectors, compare_vector_ptrs_by_name);
+
+ struct pivot_table *table = pivot_table_create (N_("Vectors"));
+ pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Attributes"),
+ N_("Variable"), N_("Print Format"));
+ struct pivot_dimension *vector_dim = pivot_dimension_create (
+ table, PIVOT_AXIS_ROW, N_("Vector and Position"));
+ vector_dim->root->show_label = true;
+
+ for (size_t i = 0; i < n_vectors; i++)
{
- const struct vector *vec = vl[i];
- size_t j;
+ const struct vector *vec = vectors[i];
- tab_joint_text (t, 0, row, 0, row + vector_get_var_cnt (vec) - 1,
- TAB_LEFT, vector_get_name (vl[i]));
+ struct pivot_category *group = pivot_category_create_group__ (
+ vector_dim->root, pivot_value_new_user_text (
+ vector_get_name (vectors[i]), -1));
- for (j = 0; j < vector_get_var_cnt (vec); j++)
+ for (size_t j = 0; j < vector_get_var_cnt (vec); j++)
{
struct variable *var = vector_get_var (vec, j);
+
+ int row = pivot_category_create_leaf (
+ group, pivot_value_new_integer (j + 1));
+
+ pivot_table_put2 (table, 0, row, pivot_value_new_variable (var));
char fmt_string[FMT_STRING_LEN_MAX + 1];
fmt_to_string (var_get_print_format (var), fmt_string);
-
- tab_text_format (t, 1, row, TAB_RIGHT, "%zu", j + 1);
- tab_text (t, 2, row, TAB_LEFT, var_get_name (var));
- tab_text (t, 3, row, TAB_LEFT, fmt_string);
- row++;
+ pivot_table_put2 (table, 1, row,
+ pivot_value_new_user_text (fmt_string, -1));
}
- tab_hline (t, TAL_1, 0, 3, row);
}
- tab_submit (t);
+ pivot_table_submit (table);
- free (vl);
+ free (vectors);
}
/* Encoding analysis. */
@@ -944,24 +955,14 @@ equal_suffix (const struct encoding *encodings, size_t n_encodings,
}
static void
-report_encodings (const struct file_handle *h, const struct sfm_reader *r)
+report_encodings (const struct file_handle *h, struct pool *pool,
+ char **titles, bool *ids, char **strings, size_t n_strings)
{
- char **titles;
- char **strings;
- bool *ids;
struct encoding encodings[N_ENCODING_NAMES];
- size_t n_encodings, n_strings, n_unique_strings;
- size_t i, j;
- struct tab_table *t;
- struct text_item *text;
- struct pool *pool;
- size_t row;
-
- pool = pool_create ();
- n_strings = sfm_get_strings (r, pool, &titles, &ids, &strings);
+ size_t n_encodings, n_unique_strings;
n_encodings = 0;
- for (i = 0; i < N_ENCODING_NAMES; i++)
+ for (size_t i = 0; i < N_ENCODING_NAMES; i++)
{
char **utf8_strings;
struct encoding *e;
@@ -974,7 +975,7 @@ report_encodings (const struct file_handle *h, const struct sfm_reader *r)
/* Hash utf8_strings. */
hash = 0;
- for (j = 0; j < n_strings; j++)
+ for (size_t j = 0; j < n_strings; j++)
hash = hash_string (utf8_strings[j], hash);
/* If there's a duplicate encoding, just mark it. */
@@ -994,83 +995,82 @@ report_encodings (const struct file_handle *h, const struct sfm_reader *r)
if (!n_encodings)
{
msg (SW, _("No valid encodings found."));
- pool_destroy (pool);
return;
}
- text = text_item_create_format (
- TEXT_ITEM_PARAGRAPH,
- _("The following table lists the encodings that can successfully read %s, "
- "by specifying the encoding name on the GET command's ENCODING "
- "subcommand. Encodings that yield identical text are listed "
- "together."), fh_get_name (h));
- text_item_submit (text);
-
- t = tab_create (2, n_encodings + 1);
- tab_title (t, _("Usable encodings for %s."), fh_get_name (h));
- tab_headers (t, 1, 0, 1, 0);
- tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, 1, n_encodings);
- tab_hline (t, TAL_1, 0, 1, 1);
- tab_text (t, 0, 0, TAB_RIGHT, "#");
- tab_text (t, 1, 0, TAB_LEFT, _("Encodings"));
- for (i = 0; i < n_encodings; i++)
+ /* Table of valid encodings. */
+ struct pivot_table *table = pivot_table_create__ (
+ pivot_value_new_text_format (N_("Usable encodings for %s."),
+ fh_get_name (h)), "Usable Encodings");
+ table->caption = pivot_value_new_text_format (
+ N_("Encodings that can successfully read %s (by specifying the encoding "
+ "name on the GET command's ENCODING subcommand). Encodings that "
+ "yield identical text are listed together."),
+ fh_get_name (h));
+
+ pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Encodings"),
+ N_("Encodings"));
+ struct pivot_dimension *number = pivot_dimension_create__ (
+ table, PIVOT_AXIS_ROW, pivot_value_new_user_text ("#", -1));
+ number->root->show_label = true;
+
+ for (size_t i = 0; i < n_encodings; i++)
{
- struct string s;
-
- ds_init_empty (&s);
- for (j = 0; j < 64; j++)
+ struct string s = DS_EMPTY_INITIALIZER;
+ for (size_t j = 0; j < 64; j++)
if (encodings[i].encodings & (UINT64_C (1) << j))
ds_put_format (&s, "%s, ", encoding_names[j]);
ds_chomp (&s, ss_cstr (", "));
- tab_text_format (t, 0, i + 1, TAB_RIGHT, "%zu", i + 1);
- tab_text (t, 1, i + 1, TAB_LEFT, ds_cstr (&s));
- ds_destroy (&s);
+ int row = pivot_category_create_leaf (number->root,
+ pivot_value_new_integer (i + 1));
+ pivot_table_put2 (
+ table, 0, row, pivot_value_new_user_text_nocopy (ds_steal_cstr (&s)));
}
- tab_submit (t);
+ pivot_table_submit (table);
n_unique_strings = 0;
- for (i = 0; i < n_strings; i++)
+ for (size_t i = 0; i < n_strings; i++)
if (!all_equal (encodings, n_encodings, i))
n_unique_strings++;
if (!n_unique_strings)
- {
- pool_destroy (pool);
- return;
- }
-
- text = text_item_create_format (
- TEXT_ITEM_PARAGRAPH,
- _("The following table lists text strings in the file dictionary that "
- "the encodings above interpret differently, along with those "
- "interpretations."));
- text_item_submit (text);
-
- t = tab_create (3, (n_encodings * n_unique_strings) + 1);
- tab_title (t, _("%s encoded text strings."), fh_get_name (h));
- tab_headers (t, 1, 0, 1, 0);
- tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, 2, n_encodings * n_unique_strings);
- tab_hline (t, TAL_1, 0, 2, 1);
-
- tab_text (t, 0, 0, TAB_LEFT, _("Purpose"));
- tab_text (t, 1, 0, TAB_RIGHT, "#");
- tab_text (t, 2, 0, TAB_LEFT, _("Text"));
-
- row = 1;
- for (i = 0; i < n_strings; i++)
+ return;
+
+ /* Table of alternative interpretations. */
+ table = pivot_table_create__ (
+ pivot_value_new_text_format (N_("%s Encoded Text Strings"),
+ fh_get_name (h)),
+ "Alternate Encoded Text Strings");
+ table->caption = pivot_value_new_text (
+ N_("Text strings in the file dictionary that the previously listed "
+ "encodings interpret differently, along with the interpretations."));
+
+ pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Text"), N_("Text"));
+
+ number = pivot_dimension_create__ (table, PIVOT_AXIS_ROW,
+ pivot_value_new_user_text ("#", -1));
+ number->root->show_label = true;
+ for (size_t i = 0; i < n_encodings; i++)
+ pivot_category_create_leaf (number->root,
+ pivot_value_new_integer (i + 1));
+
+ struct pivot_dimension *purpose = pivot_dimension_create (
+ table, PIVOT_AXIS_ROW, N_("Purpose"));
+ purpose->root->show_label = true;
+
+ for (size_t i = 0; i < n_strings; i++)
if (!all_equal (encodings, n_encodings, i))
{
int prefix = equal_prefix (encodings, n_encodings, i);
int suffix = equal_suffix (encodings, n_encodings, i);
- tab_joint_text (t, 0, row, 0, row + n_encodings - 1,
- TAB_LEFT, titles[i]);
- tab_hline (t, TAL_1, 0, 2, row);
- for (j = 0; j < n_encodings; j++)
+ int purpose_idx = pivot_category_create_leaf (
+ purpose->root, pivot_value_new_user_text (titles[i], -1));
+
+ for (size_t j = 0; j < n_encodings; j++)
{
const char *s = encodings[j].utf8_strings[i] + prefix;
- tab_text_format (t, 1, row, TAB_RIGHT, "%zu", j + 1);
if (prefix || suffix)
{
size_t len = strlen (s) - suffix;
@@ -1082,44 +1082,16 @@ report_encodings (const struct file_handle *h, const struct sfm_reader *r)
ds_put_substring (&entry, ss_buffer (s, len));
if (suffix)
ds_put_cstr (&entry, "...");
- tab_text (t, 2, row, TAB_LEFT, ds_cstr (&entry));
+
+ pivot_table_put3 (table, 0, j, purpose_idx,
+ pivot_value_new_user_text_nocopy (
+ ds_steal_cstr (&entry)));
}
else
- tab_text (t, 2, row, TAB_LEFT, s);
- row++;
+ pivot_table_put3 (table, 0, j, purpose_idx,
+ pivot_value_new_user_text (s, -1));
}
}
- tab_submit (t);
-
- pool_destroy (pool);
-}
-
-static unsigned int
-dict_display_mask (const struct dictionary *d)
-{
- size_t n_vars = dict_get_var_cnt (d);
- unsigned int mask;
- size_t i;
-
- mask = DF_ALL & ~(DF_MEASURE | DF_ROLE | DF_ALIGNMENT | DF_WIDTH);
- for (i = 0; i < n_vars; i++)
- {
- const struct variable *v = dict_get_var (d, i);
- enum val_type val = var_get_type (v);
- int width = var_get_width (v);
-
- if (var_get_measure (v) != var_default_measure (val))
- mask |= DF_MEASURE;
-
- if (var_get_role (v) != ROLE_INPUT)
- mask |= DF_ROLE;
-
- if (var_get_alignment (v) != var_default_alignment (val))
- mask |= DF_ALIGNMENT;
-
- if (var_get_display_width (v) != var_default_display_width (width))
- mask |= DF_WIDTH;
- }
- return mask;
+ pivot_table_submit (table);
}