/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010 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
#include <config.h>
#include <ctype.h>
+#include <float.h>
#include <stdlib.h>
-#include <data/attributes.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/file-handle-def.h>
-#include <data/format.h>
-#include <data/missing-values.h>
-#include <data/procedure.h>
-#include <data/sys-file-reader.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <data/vector.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/array.h>
-#include <libpspp/hash.h>
-#include <libpspp/message.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <output/tab.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/attributes.h"
+#include "data/casereader.h"
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#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"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/array.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/string-array.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
int r, i;
lex_match_id (lexer, "FILE");
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
- h = fh_parse (lexer, FH_REF_FILE);
+ h = fh_parse (lexer, FH_REF_FILE, NULL);
if (!h)
return CMD_FAILURE;
- reader = sfm_open_reader (h, &d, &info);
+ reader = sfm_open_reader (h, NULL, &d, &info);
if (!reader)
{
fh_unref (h);
}
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, _("System File"));
+
+ 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) ? dict_get_encoding(d) : _("Unknown"));
+ 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, _("Charset:"));
+ tab_text (t, 1, r++, TAB_LEFT, dict_get_encoding (d));
tab_submit (t);
dict_destroy (d);
fh_unref (h);
- return lex_end_of_command (lexer);
+ sfm_read_info_destroy (&info);
+ return CMD_SUCCESS;
}
\f
/* DISPLAY utility. */
return CMD_FAILURE;
if (dict_get_label (dataset_dict (ds)) == NULL)
tab_output_text (TAB_LEFT,
- _("The active file does not have a file label."));
+ _("The active dataset does not have a file label."));
else
- {
- tab_output_text (TAB_LEFT | TAT_TITLE, _("File label:"));
- tab_output_text (TAB_LEFT | TAB_FIX, dict_get_label (dataset_dict (ds)));
- }
+ tab_output_text_format (TAB_LEFT, _("File label: %s"),
+ dict_get_label (dataset_dict (ds)));
}
else
{
if (lex_match_id (lexer, "VECTORS"))
{
display_vectors (dataset_dict(ds), sorted);
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
}
else if (lex_match_id (lexer, "SCRATCH"))
{
break;
}
- lex_match (lexer, '/');
+ lex_match (lexer, T_SLASH);
lex_match_id (lexer, "VARIABLES");
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
- if (lex_token (lexer) != '.')
+ if (lex_token (lexer) != T_ENDCMD)
{
if (!parse_variables_const (lexer, dataset_dict (ds), &vl, &n,
PV_NONE))
flags);
}
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
}
static void
static void
display_documents (const struct dictionary *dict)
{
- const char *documents = dict_get_documents (dict);
+ const struct string_array *documents = dict_get_documents (dict);
- if (documents == NULL)
- tab_output_text (TAB_LEFT, _("The active file dictionary does not "
+ if (string_array_is_empty (documents))
+ tab_output_text (TAB_LEFT, _("The active dataset dictionary does not "
"contain any documents."));
else
{
- struct string line = DS_EMPTY_INITIALIZER;
size_t i;
tab_output_text (TAB_LEFT | TAT_TITLE,
- _("Documents in the active file:"));
+ _("Documents in the active dataset:"));
for (i = 0; i < dict_get_document_line_cnt (dict); i++)
- {
- dict_get_document_line (dict, i, &line);
- tab_output_text (TAB_LEFT | TAB_FIX, ds_cstr (&line));
- }
- ds_destroy (&line);
+ tab_output_text (TAB_LEFT | TAB_FIX, dict_get_document_line (dict, i));
}
}
display_attributes (struct tab_table *t, const struct attrset *set, int flags,
int c, int r)
{
- struct attrset_iterator i;
- struct attribute *attr;
+ struct attribute **attrs;
+ size_t n_attrs;
+ size_t i;
- for (attr = attrset_first (set, &i); attr != NULL;
- attr = attrset_next (set, &i))
+ n_attrs = attrset_count (set);
+ attrs = attrset_sorted (set);
+ for (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;
+ size_t j;
if (!(flags & DF_AT_ATTRIBUTES) && is_at_name (name))
continue;
n_values = attribute_get_n_values (attr);
- for (i = 0; i < n_values; i++)
+ for (j = 0; j < n_values; j++)
{
if (n_values > 1)
- tab_text_format (t, c, r, TAB_LEFT, "%s[%d]", name, i + 1);
+ tab_text_format (t, c, r, 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));
+ tab_text (t, c + 1, r, TAB_LEFT, attribute_get_value (attr, j));
r++;
}
}
+ free (attrs);
}
static void
/* Make sure that enough rows are allocated. */
need_rows = 1;
if (flags & ~(DF_DICT_INDEX | DF_VARIABLE_LABELS))
- need_rows += 15;
+ 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))
if (flags & DF_VARIABLE_LABELS && var_has_label (v))
{
- tab_joint_text (t, 1, r, 2, r, TAB_LEFT, var_get_label (v));
+ if (flags & ~(DF_DICT_INDEX | DF_VARIABLE_LABELS))
+ tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
+ _("Label: %s"), var_get_label (v));
+ else
+ tab_joint_text (t, 1, r, 2, r, TAB_LEFT, var_get_label (v));
r++;
}
}
}
- /* Measurement level, display width, alignment. */
+ /* Measurement level, role, display width, alignment. */
if (flags & DF_MISC)
{
- enum measure m = var_get_measure (v);
- enum alignment a = var_get_alignment (v);
+ enum var_role role = var_get_role (v);
tab_joint_text_format (t, 1, r, 2, r, TAB_LEFT,
_("Measure: %s"),
- m == MEASURE_NOMINAL ? _("Nominal")
- : m == MEASURE_ORDINAL ? _("Ordinal")
- : _("Scale"));
+ 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"),
- a == ALIGN_LEFT ? _("Left")
- : a == ALIGN_CENTRE ? _("Center")
- : _("Right"));
+ 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));
double x, y;
mv_get_range (mv, &x, &y);
if (x == LOWEST)
- cp += sprintf (cp, "LOWEST THRU %g", y);
+ cp += sprintf (cp, "LOWEST THRU %.*g", DBL_DIG + 1, y);
else if (y == HIGHEST)
- cp += sprintf (cp, "%g THRU HIGHEST", x);
+ cp += sprintf (cp, "%.*g THRU HIGHEST", DBL_DIG + 1, x);
else
- cp += sprintf (cp, "%g THRU %g", x, y);
+ cp += sprintf (cp, "%.*g THRU %.*g",
+ DBL_DIG + 1, x,
+ DBL_DIG + 1, y);
cnt++;
}
for (i = 0; i < mv_n_values (mv); i++)
if (cnt++ > 0)
cp += sprintf (cp, "; ");
if (var_is_numeric (v))
- cp += sprintf (cp, "%g", value->f);
+ cp += sprintf (cp, "%.*g", DBL_DIG + 1, value->f);
else
{
int width = var_get_width (v);
for (i = 0; i < n_labels; i++)
{
const struct val_lab *vl = labels[i];
- char buf[MAX_STRING + 1];
- if (var_is_alpha (v))
- {
- int width = var_get_width (v);
- memcpy (buf, value_str (&vl->value, width), width);
- buf[width] = 0;
- }
- else
- sprintf (buf, "%g", vl->value.f);
-
- tab_text (t, 1, r, TAB_NONE, buf);
- tab_text (t, 2, r, TAB_LEFT, val_lab_get_label (vl));
+ 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);
projects / pspp / blobdiff