X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsplit-file.c;h=8a134e1e769eca5562e57e31febb49b9c29b03d0;hb=24cbabb1547682037cda854b46c2e4bdf87a2c8a;hp=ef34d7e92c4e06f77e0b18185135c91a65d7143c;hpb=244ade48f9c233532cc535d3233fdef53bf9266b;p=pspp diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c index ef34d7e92c..8a134e1e76 100644 --- a/src/language/dictionary/split-file.c +++ b/src/language/dictionary/split-file.c @@ -1,67 +1,76 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/case.h" +#include "data/data-out.h" +#include "data/dataset.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/value-labels.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/dictionary/split-file.h" +#include "language/lexer/lexer.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" +#include "output/pivot-table.h" + +#include "gl/xalloc.h" #include "gettext.h" +#define N_(msgid) msgid #define _(msgid) gettext (msgid) int -cmd_split_file (struct dataset *ds) +cmd_split_file (struct lexer *lexer, struct dataset *ds) { - if (lex_match_id ("OFF")) - dict_set_split_vars (dataset_dict (ds), NULL, 0); + if (lex_match_id (lexer, "OFF")) + dict_clear_split_vars (dataset_dict (ds)); else { struct variable **v; size_t n; - /* For now, ignore SEPARATE and LAYERED. */ - (void) ( lex_match_id ("SEPARATE") || lex_match_id ("LAYERED") ); - - lex_match (T_BY); - if (!parse_variables (dataset_dict (ds), &v, &n, PV_NO_DUPLICATE)) + enum split_type type = (!lex_match_id (lexer, "LAYERED") + && lex_match_id (lexer, "SEPARATE") + ? SPLIT_SEPARATE + : SPLIT_LAYERED); + + lex_match (lexer, T_BY); + if (!parse_variables (lexer, dataset_dict (ds), &v, &n, PV_NO_DUPLICATE)) return CMD_CASCADING_FAILURE; - dict_set_split_vars (dataset_dict (ds), v, n); + if (n > MAX_SPLITS) + { + verify (MAX_SPLITS == 8); + msg (SE, _("At most 8 split variables may be specified.")); + free (v); + return CMD_CASCADING_FAILURE; + } + + dict_set_split_vars (dataset_dict (ds), v, n, type); free (v); } - return lex_end_of_command (); + return CMD_SUCCESS; } /* Dumps out the values of all the split variables for the case C. */ @@ -69,41 +78,26 @@ void output_split_file_values (const struct dataset *ds, const struct ccase *c) { const struct dictionary *dict = dataset_dict (ds); - struct variable *const *split; - struct tab_table *t; - size_t split_cnt; - int i; - - split_cnt = dict_get_split_cnt (dict); - if (split_cnt == 0) + size_t n_vars = dict_get_n_splits (dict); + if (n_vars == 0) return; - t = tab_create (3, split_cnt + 1, 0); - tab_dim (t, tab_natural_dimensions); - tab_vline (t, TAL_GAP, 1, 0, split_cnt); - tab_vline (t, TAL_GAP, 2, 0, split_cnt); - tab_text (t, 0, 0, TAB_NONE, _("Variable")); - tab_text (t, 1, 0, TAB_LEFT, _("Value")); - tab_text (t, 2, 0, TAB_LEFT, _("Label")); - split = dict_get_split_vars (dict); - for (i = 0; i < split_cnt; i++) + struct pivot_table *table = pivot_table_create (N_("Split Values")); + pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Value"), + N_("Value")); + struct pivot_dimension *variables = pivot_dimension_create ( + table, PIVOT_AXIS_ROW, N_("Variable")); + variables->root->show_label = true; + + for (size_t i = 0; i < n_vars; i++) { - struct variable *v = split[i]; - char temp_buf[80]; - const char *val_lab; - - assert (v->type == NUMERIC || v->type == ALPHA); - tab_text (t, 0, i + 1, TAB_LEFT | TAT_PRINTF, "%s", v->name); - - data_out (temp_buf, &v->print, case_data (c, v->fv)); - - temp_buf[v->print.w] = 0; - tab_text (t, 1, i + 1, TAT_PRINTF, "%.*s", v->print.w, temp_buf); - - val_lab = val_labs_find (v->val_labs, *case_data (c, v->fv)); - if (val_lab) - tab_text (t, 2, i + 1, TAB_LEFT, val_lab); + const struct variable *v = dict_get_split_vars (dict)[i]; + int row = pivot_category_create_leaf (variables->root, + pivot_value_new_variable (v)); + + pivot_table_put2 (table, 0, row, + pivot_value_new_var_value (v, case_data (c, v))); } - tab_flags (t, SOMF_NO_TITLE); - tab_submit (t); + + pivot_table_submit (table); }