X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsys-file-info.c;h=a13dda37d746f5fae28c8c3d44e46fa353461a64;hb=eb72e2843fa902b185680a756e79e91b68caea49;hp=220faa3b2a97c0684f1159e4ee2b64722a3c71fc;hpb=888d0f91d57e0c3c5a4206c30ac71eb87bf44227;p=pspp diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c index 220faa3b2a..a13dda37d7 100644 --- a/src/language/dictionary/sys-file-info.c +++ b/src/language/dictionary/sys-file-info.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -24,10 +23,13 @@ #include #include +#include +#include #include #include #include #include +#include #include #include #include @@ -102,7 +104,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) return CMD_FAILURE; sfm_close_reader (reader); - t = tab_create (2, 9, 0); + t = tab_create (2, 10, 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)); @@ -116,25 +118,36 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) tab_text (t, 0, 2, TAB_LEFT, _("Created:")); tab_text (t, 1, 2, TAB_LEFT | TAT_PRINTF, "%s %s by %s", info.creation_date, info.creation_time, info.product); - tab_text (t, 0, 3, TAB_LEFT, _("Endian:")); - tab_text (t, 1, 3, TAB_LEFT, info.big_endian ? _("Big.") : _("Little.")); - tab_text (t, 0, 4, TAB_LEFT, _("Variables:")); - tab_text (t, 1, 4, TAB_LEFT | TAT_PRINTF, "%d", - dict_get_var_cnt (d)); - tab_text (t, 0, 5, TAB_LEFT, _("Cases:")); - tab_text (t, 1, 5, TAB_LEFT | TAT_PRINTF, + tab_text (t, 0, 3, TAB_LEFT, _("Integer Format:")); + tab_text (t, 1, 3, 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, + 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 (t, 1, 5, TAB_LEFT | TAT_PRINTF, "%u", + (unsigned int) dict_get_var_cnt (d)); + tab_text (t, 0, 6, TAB_LEFT, _("Cases:")); + tab_text (t, 1, 6, TAB_LEFT | TAT_PRINTF, info.case_cnt == -1 ? _("Unknown") : "%d", info.case_cnt); - tab_text (t, 0, 6, TAB_LEFT, _("Type:")); - tab_text (t, 1, 6, TAB_LEFT, _("System File.")); - tab_text (t, 0, 7, TAB_LEFT, _("Weight:")); + 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:")); { struct variable *weight_var = dict_get_weight (d); - tab_text (t, 1, 7, TAB_LEFT, + tab_text (t, 1, 8, TAB_LEFT, (weight_var != NULL ? var_get_name (weight_var) : _("Not weighted."))); } - tab_text (t, 0, 8, TAB_LEFT, _("Mode:")); - tab_text (t, 1, 8, TAB_LEFT | TAT_PRINTF, + tab_text (t, 0, 9, TAB_LEFT, _("Mode:")); + tab_text (t, 1, 9, TAB_LEFT | TAT_PRINTF, _("Compression %s."), info.compressed ? _("on") : _("off")); tab_dim (t, tab_natural_dimensions); tab_submit (t); @@ -151,7 +164,7 @@ cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) for (r = 1, i = 0; i < dict_get_var_cnt (d); i++) { struct variable *v = dict_get_var (d, i); - const int nvl = val_labs_count (v->val_labs); + const int nvl = val_labs_count (var_get_value_labels (v)); if (r + 10 + nvl > nr) { @@ -275,7 +288,7 @@ cmd_display (struct lexer *lexer, struct dataset *ds) } if (sorted) - sort (vl, n, sizeof *vl, compare_var_ptr_names, NULL); + sort (vl, n, sizeof *vl, compare_var_ptrs_by_name, NULL); display_variables (vl, n, as); @@ -399,7 +412,7 @@ display_variables (struct variable **vl, size_t n, int as) if (as == AS_DICTIONARY || as == AS_VARIABLES) { - int nvl = val_labs_count (v->val_labs); + int nvl = val_labs_count (var_get_value_labels (v)); if (r + 10 + nvl > nr) { @@ -419,7 +432,8 @@ display_variables (struct variable **vl, size_t n, int as) } if (as != AS_NAMES) { - tab_text (t, pc, r, TAT_PRINTF, "%d", v->index + 1); + tab_text (t, pc, r, TAT_PRINTF, "%d", + (int) var_get_dict_index (v) + 1); tab_hline (t, TAL_1, 0, nc - 1, r); } r++; @@ -451,7 +465,7 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as) /* Put the name, var label, and position into the first row. */ tab_text (t, 0, r, TAB_LEFT, var_get_name (v)); - tab_text (t, 3, r, TAT_PRINTF, "%d", v->index + 1); + tab_text (t, 3, r, TAT_PRINTF, "%d", (int) var_get_dict_index (v) + 1); if (as == AS_DICTIONARY && var_has_label (v)) { @@ -524,8 +538,9 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as) } /* Value labels. */ - if (as == AS_DICTIONARY && val_labs_count (v->val_labs)) + if (as == AS_DICTIONARY && var_has_value_labels (v)) { + const struct val_labs *val_labs = var_get_value_labels (v); struct val_labs_iterator *i; struct val_lab *vl; int orig_r = r; @@ -537,8 +552,8 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as) #endif tab_hline (t, TAL_1, 1, 2, r); - for (vl = val_labs_first_sorted (v->val_labs, &i); vl != NULL; - vl = val_labs_next (v->val_labs, &i)) + for (vl = val_labs_first_sorted (val_labs, &i); vl != NULL; + vl = val_labs_next (val_labs, &i)) { char buf[128]; @@ -564,17 +579,6 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as) return r; } -static int -compare_vectors_by_name (const void *a_, const void *b_) -{ - struct vector *const *pa = a_; - struct vector *const *pb = b_; - struct vector *a = *pa; - struct vector *b = *pb; - - return strcasecmp (a->name, b->name); -} - /* Display a list of vectors. If SORTED is nonzero then they are sorted alphabetically. */ static void @@ -584,6 +588,8 @@ display_vectors (const struct dictionary *dict, int sorted) int i; struct tab_table *t; size_t nvec; + size_t nrow; + size_t row; nvec = dict_get_vector_cnt (dict); if (nvec == 0) @@ -593,32 +599,52 @@ display_vectors (const struct dictionary *dict, int sorted) } vl = xnmalloc (nvec, sizeof *vl); - for (i = 0; i < nvec; i++) - vl[i] = dict_get_vector (dict, i); + nrow = 0; + for (i = 0; i < nvec; i++) + { + vl[i] = dict_get_vector (dict, i); + nrow += vector_get_var_cnt (vl[i]); + } if (sorted) - qsort (vl, nvec, sizeof *vl, compare_vectors_by_name); + qsort (vl, nvec, sizeof *vl, compare_vector_ptrs_by_name); - t = tab_create (1, nvec + 1, 0); + t = tab_create (4, nrow + 1, 0); tab_headers (t, 0, 0, 1, 0); tab_columns (t, TAB_COL_DOWN, 1); tab_dim (t, tab_natural_dimensions); - tab_hline (t, TAL_1, 0, 0, 1); + 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")); tab_flags (t, SOMF_NO_TITLE); - for (i = 0; i < nvec; i++) - tab_text (t, 0, i + 1, TAB_LEFT, vl[i]->name); - tab_submit (t); - - free (vl); -} - - - - - - - + row = 1; + for (i = 0; i < nvec; i++) + { + const struct vector *vec = vl[i]; + size_t j; + + tab_joint_text (t, 0, row, 0, row + vector_get_var_cnt (vec) - 1, + TAB_LEFT, vector_get_name (vl[i])); + for (j = 0; j < vector_get_var_cnt (vec); j++) + { + struct variable *var = vector_get_var (vec, j); + char fmt_string[FMT_STRING_LEN_MAX + 1]; + fmt_to_string (var_get_print_format (var), fmt_string); + + tab_text (t, 1, row, TAB_RIGHT | TAT_PRINTF, "%d", (int) j + 1); + tab_text (t, 2, row, TAB_LEFT, var_get_name (var)); + tab_text (t, 3, row, TAB_LEFT, fmt_string); + row++; + } + tab_hline (t, TAL_1, 0, 3, row); + } + tab_submit (t); + free (vl); +}