X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsys-file-info.c;h=b0c35ec0ce47f9b9206ce1cc2170c226d878e28e;hb=c70c924972443e3ec2713e421815cbf959af2582;hp=363d5b63b6eb0e5542047bc711d238547db838d5;hpb=1076f8e88e2eee1bc780edd9d79d696a38af936d;p=pspp
diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index 363d5b63b6..b0c35ec0ce 100644
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013, 2014 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
@@ -13,12 +13,14 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-
#include
#include
+#include
+#include
#include
+#include "data/any-reader.h"
#include "data/attributes.h"
#include "data/casereader.h"
#include "data/dataset.h"
@@ -26,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"
@@ -35,145 +36,240 @@
#include "language/lexer/lexer.h"
#include "language/lexer/variable-parser.h"
#include "libpspp/array.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/i18n.h"
#include "libpspp/message.h"
#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 "gl/count-one-bits.h"
+#include "gl/localcharset.h"
+#include "gl/intprops.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
#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_MISC = 1 << 7,
- DF_ALL = (1 << 8) - 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 int describe_variable (const struct variable *v, struct tab_table *t,
- int r, int pc, int flags);
+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 void report_encodings (const struct file_handle *, struct pool *,
+ char **titles, bool *ids,
+ char **strings, size_t n_strings);
/* SYSFILE INFO utility. */
int
cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED)
{
+ struct any_reader *any_reader;
struct file_handle *h;
struct dictionary *d;
struct tab_table *t;
struct casereader *reader;
- struct sfm_read_info info;
- int r, i;
+ struct any_read_info info;
+ char *encoding;
+ int r;
- lex_match_id (lexer, "FILE");
- lex_match (lexer, T_EQUALS);
+ h = NULL;
+ encoding = NULL;
+ for (;;)
+ {
+ lex_match (lexer, T_SLASH);
- h = fh_parse (lexer, FH_REF_FILE, NULL);
- if (!h)
- return CMD_FAILURE;
+ if (lex_match_id (lexer, "FILE") || lex_is_string (lexer))
+ {
+ lex_match (lexer, T_EQUALS);
- reader = sfm_open_reader (h, NULL, &d, &info);
- if (!reader)
+ fh_unref (h);
+ h = fh_parse (lexer, FH_REF_FILE, NULL);
+ if (h == NULL)
+ goto error;
+ }
+ else if (lex_match_id (lexer, "ENCODING"))
+ {
+ lex_match (lexer, T_EQUALS);
+
+ if (!lex_force_string (lexer))
+ goto error;
+
+ free (encoding);
+ encoding = ss_xstrdup (lex_tokss (lexer));
+
+ lex_get (lexer);
+ }
+ else
+ break;
+ }
+
+ if (h == NULL)
{
- fh_unref (h);
+ lex_sbc_missing ("FILE");
+ goto error;
+ }
+
+ any_reader = any_reader_open (h);
+ if (!any_reader)
+ {
+ free (encoding);
return CMD_FAILURE;
}
+
+ if (encoding && !strcasecmp (encoding, "detect"))
+ {
+ 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 = any_reader_decode (any_reader, encoding, &d, &info);
+ if (!reader)
+ goto error;
casereader_destroy (reader);
- t = tab_create (2, 11);
+ t = tab_create (2, 11 + (info.product_ext != NULL));
+ r = 0;
tab_vline (t, TAL_GAP, 1, 0, 8);
- tab_text (t, 0, 0, TAB_LEFT, _("File:"));
- tab_text (t, 1, 0, TAB_LEFT, fh_get_file_name (h));
- tab_text (t, 0, 1, TAB_LEFT, _("Label:"));
+
+ tab_text (t, 0, r, TAB_LEFT, _("File:"));
+ tab_text (t, 1, r++, TAB_LEFT, fh_get_file_name (h));
+
+ 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, 1, TAB_LEFT, label);
+ tab_text (t, 1, r++, TAB_LEFT, label);
}
- tab_text (t, 0, 2, TAB_LEFT, _("Created:"));
- tab_text_format (t, 1, 2, TAB_LEFT, "%s %s by %s",
+
+ 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);
- tab_text (t, 0, 3, TAB_LEFT, _("Integer Format:"));
- tab_text (t, 1, 3, TAB_LEFT,
+
+ 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, 4, TAB_LEFT, _("Real Format:"));
- tab_text (t, 1, 4, TAB_LEFT,
+
+ 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, 5, TAB_LEFT, _("Variables:"));
- tab_text_format (t, 1, 5, TAB_LEFT, "%zu", dict_get_var_cnt (d));
- tab_text (t, 0, 6, TAB_LEFT, _("Cases:"));
+
+ 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, 6, TAB_LEFT, _("Unknown"));
+ tab_text (t, 1, r, TAB_LEFT, _("Unknown"));
else
- tab_text_format (t, 1, 6, TAB_LEFT, "%ld", (long int) info.case_cnt);
- tab_text (t, 0, 7, TAB_LEFT, _("Type:"));
- tab_text (t, 1, 7, TAB_LEFT, _("System File"));
- tab_text (t, 0, 8, TAB_LEFT, _("Weight:"));
+ 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, gettext (info.klass->name));
+
+ tab_text (t, 0, r, TAB_LEFT, _("Weight:"));
{
struct variable *weight_var = dict_get_weight (d);
- tab_text (t, 1, 8, TAB_LEFT,
+ tab_text (t, 1, r++, TAB_LEFT,
(weight_var != NULL
? var_get_name (weight_var) : _("Not weighted.")));
}
- tab_text (t, 0, 9, TAB_LEFT, _("Mode:"));
- tab_text_format (t, 1, 9, TAB_LEFT,
- _("Compression %s."), info.compressed ? _("on") : _("off"));
-
- tab_text (t, 0, 10, TAB_LEFT, _("Charset:"));
- tab_text (t, 1, 10, TAB_LEFT, dict_get_encoding (d));
+ tab_text (t, 0, r, TAB_LEFT, _("Compression:"));
+ tab_text_format (t, 1, r++, TAB_LEFT,
+ info.compression == ANY_COMP_NONE ? _("None")
+ : info.compression == ANY_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 (4, 1 + 2 * dict_get_var_cnt (d));
- tab_headers (t, 0, 0, 1, 0);
- tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Variable"));
- tab_joint_text (t, 1, 0, 2, 0, TAB_LEFT | TAT_TITLE, _("Description"));
- tab_text (t, 3, 0, TAB_LEFT | TAT_TITLE, _("Position"));
- tab_hline (t, TAL_2, 0, 3, 1);
- for (r = 1, i = 0; i < dict_get_var_cnt (d); i++)
- r = describe_variable (dict_get_var (d, i), t, r, 3,
- DF_ALL & ~DF_AT_ATTRIBUTES);
+ 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);
- tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, 3, r);
- tab_vline (t, TAL_1, 1, 0, r);
- tab_vline (t, TAL_1, 3, 0, r);
-
- tab_resize (t, -1, r);
- tab_submit (t);
-
- 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:
+ fh_unref (h);
+ free (encoding);
+ return CMD_FAILURE;
}
/* DISPLAY utility. */
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)
@@ -211,31 +307,36 @@ 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_MISC},
+ {"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;
+ struct dictionary *dict = dataset_dict (ds);
flags = 0;
for (sbc = subcommands; sbc->name != NULL; sbc++)
@@ -251,32 +352,38 @@ cmd_display (struct lexer *lexer, struct dataset *ds)
if (lex_token (lexer) != T_ENDCMD)
{
- if (!parse_variables_const (lexer, dataset_dict (ds), &vl, &n,
- PV_NONE))
+ if (!parse_variables_const (lexer, dict, &vl, &n, PV_NONE))
{
free (vl);
return CMD_FAILURE;
}
}
else
- dict_get_vars (dataset_dict (ds), &vl, &n, 0);
+ 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;
@@ -310,309 +417,254 @@ display_documents (const struct dictionary *dict)
static void
display_variables (const struct variable **vl, size_t n, int flags)
{
- struct tab_table *t;
- int nc; /* Number of columns. */
- int pc; /* `Position column' */
- int r; /* Current row. */
- size_t i;
-
- /* One column for the name,
- two columns for general description,
- one column for dictionary index. */
- nc = 1;
- if (flags & ~DF_DICT_INDEX)
- nc += 2;
- pc = nc;
- if (flags & DF_DICT_INDEX)
- nc++;
-
- t = tab_create (nc, n + 5);
+ int nc = count_one_bits (flags);
+ struct tab_table *t = tab_create (nc, n + 1);
+ tab_title (t, "%s", _("Variables"));
tab_headers (t, 0, 0, 1, 0);
tab_hline (t, TAL_2, 0, nc - 1, 1);
+
+ struct heading
+ {
+ int flag;
+ const char *title;
+ };
+ static const struct heading headings[] = {
+ { DF_NAME, N_("Name") },
+ { 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, x = 0; i < sizeof headings / sizeof *headings; i++)
+ if (flags & headings[i].flag)
+ tab_text (t, x++, 0, TAB_LEFT | TAT_TITLE, gettext (headings[i].title));
+
+ for (size_t i = 0; i < n; i++)
+ {
+ const struct variable *v = vl[i];
+ size_t y = i + 1;
+ size_t x = 0;
+ if (flags & DF_NAME)
+ tab_text (t, x++, y, TAB_LEFT, var_get_name (v));
+ if (flags & DF_POSITION)
+ {
+ char s[INT_BUFSIZE_BOUND (size_t)];
+
+ sprintf (s, "%zu", var_get_dict_index (v) + 1);
+ tab_text (t, x++, y, TAB_LEFT, s);
+ }
+ if (flags & DF_LABEL)
+ {
+ const char *label = var_get_label (v);
+ if (label)
+ tab_text (t, x, y, TAB_LEFT, label);
+ x++;
+ }
+ if (flags & DF_MEASUREMENT_LEVEL)
+ tab_text (t, x++, y, TAB_LEFT,
+ measure_to_string (var_get_measure (v)));
+ if (flags & DF_ROLE)
+ tab_text (t, x++, y, TAB_LEFT,
+ var_role_to_string (var_get_role (v)));
+ if (flags & DF_WIDTH)
+ {
+ char s[INT_BUFSIZE_BOUND (int)];
+ sprintf (s, "%d", var_get_display_width (v));
+ tab_text (t, x++, y, TAB_RIGHT, s);
+ }
+ if (flags & DF_ALIGNMENT)
+ tab_text (t, x++, y, TAB_LEFT,
+ alignment_to_string (var_get_alignment (v)));
+ if (flags & DF_PRINT_FORMAT)
+ {
+ const struct fmt_spec *print = var_get_print_format (v);
+ char s[FMT_STRING_LEN_MAX + 1];
+
+ tab_text (t, x++, y, TAB_LEFT, fmt_to_string (print, s));
+ }
+ if (flags & DF_WRITE_FORMAT)
+ {
+ const struct fmt_spec *write = var_get_write_format (v);
+ char s[FMT_STRING_LEN_MAX + 1];
+
+ tab_text (t, x++, y, TAB_LEFT, fmt_to_string (write, s));
+ }
+ if (flags & DF_MISSING_VALUES)
+ {
+ const struct missing_values *mv = var_get_missing_values (v);
+
+ struct string s = DS_EMPTY_INITIALIZER;
+ if (mv_has_range (mv))
+ {
+ 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);
+ else
+ ds_put_format (&s, "%.*g THRU %.*g",
+ DBL_DIG + 1, x,
+ DBL_DIG + 1, y);
+ }
+ for (size_t j = 0; j < mv_n_values (mv); j++)
+ {
+ const union value *value = mv_get_value (mv, j);
+ if (!ds_is_empty (&s))
+ ds_put_cstr (&s, "; ");
+ if (var_is_numeric (v))
+ ds_put_format (&s, "%.*g", DBL_DIG + 1, value->f);
+ 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, '"');
+ }
+ }
+ if (!ds_is_empty (&s))
+ tab_text (t, x, y, TAB_LEFT, ds_cstr (&s));
+ ds_destroy (&s);
+ x++;
+
+ assert (x == nc);
+ }
+ }
+
+ tab_submit (t);
+}
+
+static void
+display_value_labels (const struct variable **vars, size_t n_vars)
+{
+ size_t n_value_labels = 0;
+ for (size_t i = 0; i < n_vars; i++)
+ n_value_labels += val_labs_count (var_get_value_labels (vars[i]));
+ if (!n_value_labels)
+ return;
+
+ struct tab_table *t = tab_create (3, n_value_labels + 1);
+ tab_title (t, "%s", _("Value Labels"));
+ tab_headers (t, 0, 0, 1, 0);
+ tab_hline (t, TAL_2, 0, 2, 1);
tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Variable"));
- if (flags & ~DF_DICT_INDEX)
- tab_joint_text (t, 1, 0, 2, 0, TAB_LEFT | TAT_TITLE,
- (flags & ~(DF_DICT_INDEX | DF_VARIABLE_LABELS)
- ? _("Description") : _("Label")));
- if (flags & DF_DICT_INDEX)
- tab_text (t, pc, 0, TAB_LEFT | TAT_TITLE, _("Position"));
-
- r = 1;
- for (i = 0; i < n; i++)
- r = describe_variable (vl[i], t, r, pc, flags);
- tab_hline (t, flags & ~DF_DICT_INDEX ? TAL_2 : TAL_1, 0, nc - 1, 1);
- if (flags)
+ tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE, _("Value"));
+ tab_text (t, 2, 0, TAB_LEFT | TAT_TITLE, _("Label"));
+
+ int y = 1;
+ for (size_t i = 0; i < n_vars; i++)
{
- tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, nc - 1, r - 1);
- tab_vline (t, TAL_1, 1, 0, r - 1);
+ 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;
+
+ tab_joint_text (t, 0, y, 0, y + (n_labels - 1), TAB_LEFT,
+ var_get_name (vars[i]));
+
+ const struct val_lab **labels = val_labs_sorted (val_labs);
+ for (size_t j = 0; j < n_labels; j++)
+ {
+ const struct val_lab *vl = labels[j];
+
+ tab_value (t, 1, y, TAB_NONE, &vl->value, vars[i], NULL);
+ tab_text (t, 2, y, TAB_LEFT, val_lab_get_escaped_label (vl));
+ y++;
+ }
+ free (labels);
}
- if (flags & ~DF_DICT_INDEX)
- tab_vline (t, TAL_1, nc - 1, 0, r - 1);
- tab_resize (t, -1, r);
tab_submit (t);
}
static bool
-is_at_name (const char *name)
+is_at_name (const char *name)
{
return name[0] == '@' || (name[0] == '$' && name[1] == '@');
}
static size_t
-count_attributes (const struct attrset *set, int flags)
+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))
+ 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;
}
-static void
-display_attributes (struct tab_table *t, const struct attrset *set, int flags,
- int c, int r)
+static int
+display_attrset (const char *name, const struct attrset *set, int flags,
+ struct tab_table *t, int y)
{
- struct attribute **attrs;
- size_t n_attrs;
- size_t i;
+ size_t n_total = count_attributes (set, flags);
+ if (!n_total)
+ return y;
- n_attrs = attrset_count (set);
- attrs = attrset_sorted (set);
- for (i = 0; i < n_attrs; i++)
+ tab_joint_text (t, 0, y, 0, y + (n_total - 1), TAB_LEFT, name);
+
+ size_t n_attrs = attrset_count (set);
+ struct attribute **attrs = attrset_sorted (set);
+ for (size_t i = 0; i < n_attrs; i++)
{
const struct attribute *attr = attrs[i];
const char *name = attribute_get_name (attr);
- size_t n_values;
- size_t i;
if (!(flags & DF_AT_ATTRIBUTES) && is_at_name (name))
continue;
- n_values = attribute_get_n_values (attr);
- for (i = 0; i < n_values; i++)
+ size_t n_values = attribute_get_n_values (attr);
+ for (size_t j = 0; j < n_values; j++)
{
if (n_values > 1)
- tab_text_format (t, c, r, TAB_LEFT, "%s[%zu]", name, i + 1);
+ tab_text_format (t, 1, y, TAB_LEFT, "%s[%zu]", name, j + 1);
else
- tab_text (t, c, r, TAB_LEFT, name);
- tab_text (t, c + 1, r, TAB_LEFT, attribute_get_value (attr, i));
- r++;
+ tab_text (t, 1, y, TAB_LEFT, name);
+ tab_text (t, 2, y, TAB_LEFT, attribute_get_value (attr, j));
+ y++;
}
}
free (attrs);
+
+ return y;
}
static void
-display_data_file_attributes (struct attrset *set, int flags)
+display_attributes (const struct attrset *dict_attrset,
+ const struct variable **vars, size_t n_vars, int flags)
{
- struct tab_table *t;
- size_t n_attrs;
-
- n_attrs = count_attributes (set, flags);
- if (!n_attrs)
+ size_t n_attributes = count_attributes (dict_attrset, flags);
+ for (size_t i = 0; i < n_vars; i++)
+ n_attributes += count_attributes (var_get_attributes (vars[i]), flags);
+ if (!n_attributes)
return;
- t = tab_create (2, n_attrs + 1);
+ struct tab_table *t = tab_create (3, n_attributes + 1);
+ tab_title (t, "%s", _("Variable and Dataset Attributes"));
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_2, 0, 1, 1);
- tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Attribute"));
- tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE, _("Value"));
- display_attributes (t, set, flags, 0, 1);
- tab_title (t, "Custom data file attributes.");
- tab_submit (t);
-}
-
-/* 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 int
-describe_variable (const struct variable *v, struct tab_table *t, int r,
- int pc, int flags)
-{
- size_t n_attrs = 0;
- int need_rows;
-
- /* Make sure that enough rows are allocated. */
- need_rows = 1;
- if (flags & ~(DF_DICT_INDEX | DF_VARIABLE_LABELS))
- need_rows += 16;
- if (flags & DF_VALUE_LABELS)
- need_rows += val_labs_count (var_get_value_labels (v));
- if (flags & (DF_ATTRIBUTES | DF_AT_ATTRIBUTES))
- {
- n_attrs = count_attributes (var_get_attributes (v), flags);
- need_rows += n_attrs;
- }
- if (r + need_rows > tab_nr (t))
- {
- int nr = MAX (r + need_rows, tab_nr (t) * 2);
- tab_realloc (t, -1, nr);
- }
-
- /* Put the name, var label, and position into the first row. */
- tab_text (t, 0, r, TAB_LEFT, var_get_name (v));
- if (flags & DF_DICT_INDEX)
- tab_text_format (t, pc, r, 0, "%zu", var_get_dict_index (v) + 1);
-
- if (flags & DF_VARIABLE_LABELS && var_has_label (v))
- {
- tab_joint_text (t, 1, r, 2, r, TAB_LEFT, var_get_label (v));
- r++;
- }
-
- /* 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);
-
- if (fmt_equal (print, write))
- {
- char str[FMT_STRING_LEN_MAX + 1];
- tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
- _("Format: %s"), fmt_to_string (print, str));
- r++;
- }
- else
- {
- char str[FMT_STRING_LEN_MAX + 1];
- tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
- _("Print Format: %s"),
- fmt_to_string (print, str));
- r++;
- tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
- _("Write Format: %s"),
- fmt_to_string (write, str));
- r++;
- }
- }
-
- /* Measurement level, role, display width, alignment. */
- if (flags & DF_MISC)
- {
- enum var_role role = var_get_role (v);
-
- tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
- _("Measure: %s"),
- measure_to_string (var_get_measure (v)));
- r++;
-
- if (role != ROLE_INPUT)
- {
- tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
- _("Role: %s"), var_role_to_string (role));
- r++;
- }
-
- tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
- _("Display Alignment: %s"),
- alignment_to_string (var_get_alignment (v)));
- r++;
-
- tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
- _("Display Width: %d"),
- var_get_display_width (v));
- r++;
- }
-
- /* Missing values if any. */
- if (flags & DF_MISSING_VALUES && var_has_missing_values (v))
- {
- const struct missing_values *mv = var_get_missing_values (v);
- char buf[128];
- char *cp;
- int cnt = 0;
- int i;
-
- cp = stpcpy (buf, _("Missing Values: "));
-
- if (mv_has_range (mv))
- {
- double x, y;
- mv_get_range (mv, &x, &y);
- if (x == LOWEST)
- cp += sprintf (cp, "LOWEST THRU %g", y);
- else if (y == HIGHEST)
- cp += sprintf (cp, "%g THRU HIGHEST", x);
- else
- cp += sprintf (cp, "%g THRU %g", x, y);
- cnt++;
- }
- for (i = 0; i < mv_n_values (mv); i++)
- {
- const union value *value = mv_get_value (mv, i);
- if (cnt++ > 0)
- cp += sprintf (cp, "; ");
- if (var_is_numeric (v))
- cp += sprintf (cp, "%g", value->f);
- else
- {
- int width = var_get_width (v);
- int mv_width = MIN (width, MV_MAX_STRING);
-
- *cp++ = '"';
- memcpy (cp, value_str (value, width), mv_width);
- cp += mv_width;
- *cp++ = '"';
- *cp = '\0';
- }
- }
-
- tab_joint_text (t, 1, r, 2, r, TAB_LEFT, buf);
- r++;
- }
-
- /* Value labels. */
- if (flags & DF_VALUE_LABELS && var_has_value_labels (v))
- {
- const struct val_labs *val_labs = var_get_value_labels (v);
- size_t n_labels = val_labs_count (val_labs);
- const struct val_lab **labels;
- int orig_r = r;
- size_t i;
-
-#if 0
- tab_text (t, 1, r, TAB_LEFT, _("Value"));
- tab_text (t, 2, r, TAB_LEFT, _("Label"));
- r++;
-#endif
-
- tab_hline (t, TAL_1, 1, 2, r);
-
- labels = val_labs_sorted (val_labs);
- for (i = 0; i < n_labels; i++)
- {
- const struct val_lab *vl = labels[i];
-
- tab_value (t, 1, r, TAB_NONE, &vl->value, v, NULL);
- tab_text (t, 2, r, TAB_LEFT, val_lab_get_escaped_label (vl));
- r++;
- }
- free (labels);
-
- tab_vline (t, TAL_1, 2, orig_r, r - 1);
- }
-
- if (flags & (DF_ATTRIBUTES | DF_AT_ATTRIBUTES) && n_attrs)
- {
- tab_joint_text (t, 1, r, 2, r, TAB_LEFT, "Custom attributes:");
- r++;
-
- display_attributes (t, var_get_attributes (v), flags, 1, r);
- r += n_attrs;
- }
+ tab_hline (t, TAL_2, 0, 2, 1);
+ tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Variable"));
+ tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE, _("Name"));
+ tab_text (t, 2, 0, TAB_LEFT | TAT_TITLE, _("Value"));
- /* Draw a line below the last row of information on this variable. */
- tab_hline (t, TAL_1, 0, tab_nc (t) - 1, r);
+ int y = display_attrset (_("(dataset)"), dict_attrset, flags, t, 1);
+ for (size_t i = 0; i < n_vars; i++)
+ y = display_attrset (var_get_name (vars[i]), var_get_attributes (vars[i]),
+ flags, t, y);
- return r;
+ tab_submit (t);
}
/* Display a list of vectors. If SORTED is nonzero then they are
@@ -681,3 +733,324 @@ display_vectors (const struct dictionary *dict, int sorted)
free (vl);
}
+
+/* Encoding analysis. */
+
+static const char *encoding_names[] = {
+ /* These encodings are from http://encoding.spec.whatwg.org/, as retrieved
+ February 2014. Encodings not supported by glibc and encodings relevant
+ only to HTML have been removed. */
+ "utf-8",
+ "windows-1252",
+ "iso-8859-2",
+ "iso-8859-3",
+ "iso-8859-4",
+ "iso-8859-5",
+ "iso-8859-6",
+ "iso-8859-7",
+ "iso-8859-8",
+ "iso-8859-10",
+ "iso-8859-13",
+ "iso-8859-14",
+ "iso-8859-16",
+ "macintosh",
+ "windows-874",
+ "windows-1250",
+ "windows-1251",
+ "windows-1253",
+ "windows-1254",
+ "windows-1255",
+ "windows-1256",
+ "windows-1257",
+ "windows-1258",
+ "koi8-r",
+ "koi8-u",
+ "ibm866",
+ "gb18030",
+ "big5",
+ "euc-jp",
+ "iso-2022-jp",
+ "shift_jis",
+ "euc-kr",
+
+ /* Added by user request. */
+ "ibm850",
+ "din_66003",
+};
+#define N_ENCODING_NAMES (sizeof encoding_names / sizeof *encoding_names)
+
+struct encoding
+ {
+ uint64_t encodings;
+ char **utf8_strings;
+ unsigned int hash;
+ };
+
+static char **
+recode_strings (struct pool *pool,
+ char **strings, bool *ids, size_t n,
+ const char *encoding)
+{
+ char **utf8_strings;
+ size_t i;
+
+ utf8_strings = pool_alloc (pool, n * sizeof *utf8_strings);
+ for (i = 0; i < n; i++)
+ {
+ struct substring utf8;
+ int error;
+
+ error = recode_pedantically ("UTF-8", encoding, ss_cstr (strings[i]),
+ pool, &utf8);
+ if (!error)
+ {
+ ss_rtrim (&utf8, ss_cstr (" "));
+ utf8.string[utf8.length] = '\0';
+
+ if (ids[i] && !id_is_plausible (utf8.string, false))
+ error = EINVAL;
+ }
+
+ if (error)
+ return NULL;
+
+ utf8_strings[i] = utf8.string;
+ }
+
+ return utf8_strings;
+}
+
+static struct encoding *
+find_duplicate_encoding (struct encoding *encodings, size_t n_encodings,
+ char **utf8_strings, size_t n_strings,
+ unsigned int hash)
+{
+ struct encoding *e;
+
+ for (e = encodings; e < &encodings[n_encodings]; e++)
+ {
+ int i;
+
+ if (e->hash != hash)
+ goto next_encoding;
+
+ for (i = 0; i < n_strings; i++)
+ if (strcmp (utf8_strings[i], e->utf8_strings[i]))
+ goto next_encoding;
+
+ return e;
+ next_encoding:;
+ }
+
+ return NULL;
+}
+
+static bool
+all_equal (const struct encoding *encodings, size_t n_encodings,
+ size_t string_idx)
+{
+ const char *s0;
+ size_t i;
+
+ s0 = encodings[0].utf8_strings[string_idx];
+ for (i = 1; i < n_encodings; i++)
+ if (strcmp (s0, encodings[i].utf8_strings[string_idx]))
+ return false;
+
+ return true;
+}
+
+static int
+equal_prefix (const struct encoding *encodings, size_t n_encodings,
+ size_t string_idx)
+{
+ const char *s0;
+ size_t prefix;
+ size_t i;
+
+ s0 = encodings[0].utf8_strings[string_idx];
+ prefix = strlen (s0);
+ for (i = 1; i < n_encodings; i++)
+ {
+ const char *si = encodings[i].utf8_strings[string_idx];
+ size_t j;
+
+ for (j = 0; j < prefix; j++)
+ if (s0[j] != si[j])
+ {
+ prefix = j;
+ if (!prefix)
+ return 0;
+ break;
+ }
+ }
+
+ while (prefix > 0 && s0[prefix - 1] != ' ')
+ prefix--;
+ return prefix;
+}
+
+static int
+equal_suffix (const struct encoding *encodings, size_t n_encodings,
+ size_t string_idx)
+{
+ const char *s0;
+ size_t s0_len;
+ size_t suffix;
+ size_t i;
+
+ s0 = encodings[0].utf8_strings[string_idx];
+ s0_len = strlen (s0);
+ suffix = s0_len;
+ for (i = 1; i < n_encodings; i++)
+ {
+ const char *si = encodings[i].utf8_strings[string_idx];
+ size_t si_len = strlen (si);
+ size_t j;
+
+ if (si_len < suffix)
+ suffix = si_len;
+ for (j = 0; j < suffix; j++)
+ if (s0[s0_len - j - 1] != si[si_len - j - 1])
+ {
+ suffix = j;
+ if (!suffix)
+ return 0;
+ break;
+ }
+ }
+
+ while (suffix > 0 && s0[s0_len - suffix] != ' ')
+ suffix--;
+ return suffix;
+}
+
+static void
+report_encodings (const struct file_handle *h, struct pool *pool,
+ char **titles, bool *ids, char **strings, size_t n_strings)
+{
+ struct encoding encodings[N_ENCODING_NAMES];
+ size_t n_encodings, n_unique_strings;
+ size_t i, j;
+ struct tab_table *t;
+ size_t row;
+
+ n_encodings = 0;
+ for (i = 0; i < N_ENCODING_NAMES; i++)
+ {
+ char **utf8_strings;
+ struct encoding *e;
+ unsigned int hash;
+
+ utf8_strings = recode_strings (pool, strings, ids, n_strings,
+ encoding_names[i]);
+ if (!utf8_strings)
+ continue;
+
+ /* Hash utf8_strings. */
+ hash = 0;
+ for (j = 0; j < n_strings; j++)
+ hash = hash_string (utf8_strings[j], hash);
+
+ /* If there's a duplicate encoding, just mark it. */
+ e = find_duplicate_encoding (encodings, n_encodings,
+ utf8_strings, n_strings, hash);
+ if (e)
+ {
+ e->encodings |= UINT64_C (1) << i;
+ continue;
+ }
+
+ e = &encodings[n_encodings++];
+ e->encodings = UINT64_C (1) << i;
+ e->utf8_strings = utf8_strings;
+ e->hash = hash;
+ }
+ if (!n_encodings)
+ {
+ msg (SW, _("No valid encodings found."));
+ return;
+ }
+
+ t = tab_create (2, n_encodings + 1);
+ tab_title (t, _("Usable encodings for %s."), fh_get_name (h));
+ tab_caption (t, _("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));
+ 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++)
+ {
+ struct string s;
+
+ ds_init_empty (&s);
+ for (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);
+ }
+ tab_submit (t);
+
+ n_unique_strings = 0;
+ for (i = 0; i < n_strings; i++)
+ if (!all_equal (encodings, n_encodings, i))
+ n_unique_strings++;
+ if (!n_unique_strings)
+ return;
+
+ t = tab_create (3, (n_encodings * n_unique_strings) + 1);
+ tab_title (t, _("%s encoded text strings."), fh_get_name (h));
+ tab_caption (t, _("Text strings in the file dictionary that the previously "
+ "listed encodings interpret differently, along with the "
+ "interpretations."));
+ 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++)
+ 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++)
+ {
+ 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;
+ struct string entry;
+
+ ds_init_empty (&entry);
+ if (prefix)
+ ds_put_cstr (&entry, "...");
+ ds_put_substring (&entry, ss_buffer (s, len));
+ if (suffix)
+ ds_put_cstr (&entry, "...");
+ tab_text (t, 2, row, TAB_LEFT, ds_cstr (&entry));
+ }
+ else
+ tab_text (t, 2, row, TAB_LEFT, s);
+ row++;
+ }
+ }
+ tab_submit (t);
+}