X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsys-file-info.c;h=8db1b68150fa81c6ae984e9fce9680a5672e898c;hb=2be9bee9da6a2ce27715e58128569594319abfa2;hp=f68a830b83810ba6eec7d4e73b42ab40b041ca91;hpb=734bcddfcfbb6f802aa0975a8423b3be5b874ca6;p=pspp-builds.git diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c index f68a830b..8db1b681 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 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -19,32 +19,29 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#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) @@ -66,22 +63,6 @@ enum static int describe_variable (const struct variable *v, struct tab_table *t, int r, int pc, int flags); -/* Sets the widths of all the columns and heights of all the rows in - table T for driver D. */ -static void -sysfile_info_dim (struct tab_table *t, struct outp_driver *d, void *aux UNUSED) -{ - static const int max[] = {20, 5, 35, 3, 0}; - const int *p; - int i; - - for (p = max; *p; p++) - t->w[p - max] = MIN (tab_natural_width (t, d, p - max), - *p * d->prop_em_width); - for (i = 0; i < t->nr; i++) - t->h[i] = tab_natural_height (t, d, i); -} - /* SYSFILE INFO utility. */ int cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) @@ -94,7 +75,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) int r, i; lex_match_id (lexer, "FILE"); - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); h = fh_parse (lexer, FH_REF_FILE); if (!h) @@ -108,7 +89,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) } casereader_destroy (reader); - t = tab_create (2, 11, 0); + t = tab_create (2, 11); 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)); @@ -138,9 +119,10 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) 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_format (t, 1, 6, TAB_LEFT, - info.case_cnt == -1 ? _("Unknown") : "%ld", - (long int) info.case_cnt); + if (info.case_cnt == -1) + tab_text (t, 1, 6, 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:")); @@ -156,15 +138,13 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) tab_text (t, 0, 10, TAB_LEFT, _("Charset:")); - tab_text_format (t, 1, 10, TAB_LEFT, - dict_get_encoding(d) ? dict_get_encoding(d) : _("Unknown")); + tab_text (t, 1, 10, TAB_LEFT, + dict_get_encoding(d) ? dict_get_encoding(d) : _("Unknown")); - tab_dim (t, tab_natural_dimensions, NULL); tab_submit (t); - t = tab_create (4, 1 + 2 * dict_get_var_cnt (d), 1); - tab_dim (t, sysfile_info_dim, NULL); + 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")); @@ -179,13 +159,12 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) tab_vline (t, TAL_1, 3, 0, r); tab_resize (t, -1, r); - tab_flags (t, SOMF_NO_TITLE); tab_submit (t); dict_destroy (d); fh_unref (h); - return lex_end_of_command (lexer); + return CMD_SUCCESS; } /* DISPLAY utility. */ @@ -212,7 +191,6 @@ cmd_display (struct lexer *lexer, struct dataset *ds) display_documents (dataset_dict (ds)); else if (lex_match_id (lexer, "FILE")) { - som_blank_line (); if (!lex_force_match_id (lexer, "LABEL")) return CMD_FAILURE; if (dict_get_label (dataset_dict (ds)) == NULL) @@ -233,7 +211,7 @@ cmd_display (struct lexer *lexer, struct dataset *ds) 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")) { @@ -269,11 +247,11 @@ cmd_display (struct lexer *lexer, struct dataset *ds) 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)) @@ -303,67 +281,32 @@ cmd_display (struct lexer *lexer, struct dataset *ds) flags); } - return lex_end_of_command (lexer); + return CMD_SUCCESS; } static void display_macros (void) { - som_blank_line (); tab_output_text (TAB_LEFT, _("Macros not supported.")); } static void display_documents (const struct dictionary *dict) { - const char *documents = dict_get_documents (dict); + const struct string_array *documents = dict_get_documents (dict); - som_blank_line (); - if (documents == NULL) + if (string_array_is_empty (documents)) tab_output_text (TAB_LEFT, _("The active file 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:")); - som_blank_line (); 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 | TAT_NOWRAP, ds_cstr (&line)); - } - ds_destroy (&line); - } -} - -static int _flags; - -/* Sets the widths of all the columns and heights of all the rows in - table T for driver D. */ -static void -variables_dim (struct tab_table *t, struct outp_driver *d, void *aux UNUSED) -{ - int pc; - int i; - - t->w[0] = tab_natural_width (t, d, 0); - if (_flags & (DF_VALUE_LABELS | DF_VARIABLE_LABELS | DF_MISSING_VALUES - | DF_AT_ATTRIBUTES | DF_ATTRIBUTES)) - { - t->w[1] = MAX (tab_natural_width (t, d, 1), d->prop_em_width * 5); - t->w[2] = MAX (tab_natural_width (t, d, 2), d->prop_em_width * 35); - pc = 3; + tab_output_text (TAB_LEFT | TAB_FIX, dict_get_document_line (dict, i)); } - else - pc = 1; - if (_flags & DF_DICT_INDEX) - t->w[pc] = tab_natural_width (t, d, pc); - - for (i = 0; i < t->nr; i++) - t->h[i] = tab_natural_height (t, d, i); } static void @@ -375,8 +318,6 @@ display_variables (const struct variable **vl, size_t n, int flags) int r; /* Current row. */ size_t i; - _flags = flags; - /* One column for the name, two columns for general description, one column for dictionary index. */ @@ -387,7 +328,7 @@ display_variables (const struct variable **vl, size_t n, int flags) if (flags & DF_DICT_INDEX) nc++; - t = tab_create (nc, n + 5, 1); + t = tab_create (nc, n + 5); 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")); @@ -397,7 +338,6 @@ display_variables (const struct variable **vl, size_t n, int flags) ? _("Description") : _("Label"))); if (flags & DF_DICT_INDEX) tab_text (t, pc, 0, TAB_LEFT | TAT_TITLE, _("Position")); - tab_dim (t, variables_dim, NULL); r = 1; for (i = 0; i < n; i++) @@ -408,12 +348,9 @@ display_variables (const struct variable **vl, size_t n, int flags) tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, nc - 1, r - 1); tab_vline (t, TAL_1, 1, 0, r - 1); } - else - tab_flags (t, SOMF_NO_TITLE); if (flags & ~DF_DICT_INDEX) tab_vline (t, TAL_1, nc - 1, 0, r - 1); tab_resize (t, -1, r); - tab_columns (t, TAB_COL_DOWN, 1); tab_submit (t); } @@ -478,15 +415,13 @@ display_data_file_attributes (struct attrset *set, int flags) if (!n_attrs) return; - t = tab_create (2, n_attrs + 1, 0); + t = tab_create (2, n_attrs + 1); 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_columns (t, TAB_COL_DOWN, 1); - tab_dim (t, tab_natural_dimensions, NULL); tab_title (t, "Custom data file attributes."); tab_submit (t); } @@ -713,10 +648,8 @@ display_vectors (const struct dictionary *dict, int sorted) if (sorted) qsort (vl, nvec, sizeof *vl, compare_vector_ptrs_by_name); - t = tab_create (4, nrow + 1, 0); + t = tab_create (4, nrow + 1); tab_headers (t, 0, 0, 1, 0); - tab_columns (t, TAB_COL_DOWN, 1); - tab_dim (t, tab_natural_dimensions, NULL); 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); @@ -724,7 +657,6 @@ display_vectors (const struct dictionary *dict, int sorted) 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")); - tab_flags (t, SOMF_NO_TITLE); row = 1; for (i = 0; i < nvec; i++)