X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsplit-file.c;h=1ebd7ae9ca6fa415cd2b13a737ea255827562244;hb=339f1956cc727eda788638644ef93ab7852b31cd;hp=38eabc45406822db0bf436d7771f0986ae575457;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp

diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c
index 38eabc4540..1ebd7ae9ca 100644
--- a/src/language/dictionary/split-file.c
+++ b/src/language/dictionary/split-file.c
@@ -1,52 +1,93 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+/* 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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+
+#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 (void)
+cmd_split_file (struct lexer *lexer, struct dataset *ds)
 {
-  if (lex_match_id ("OFF"))
-    dict_set_split_vars (default_dict, NULL, 0);
+  if (lex_match_id (lexer, "OFF"))
+    dict_set_split_vars (dataset_dict (ds), NULL, 0);
   else
     {
       struct variable **v;
       size_t n;
 
       /* For now, ignore SEPARATE and LAYERED. */
-      lex_match_id ("SEPARATE") || lex_match_id ("LAYERED");
-      
-      lex_match (T_BY);
-      if (!parse_variables (default_dict, &v, &n, PV_NO_DUPLICATE))
+      (void) (lex_match_id (lexer, "SEPARATE") || lex_match_id (lexer, "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 (default_dict, v, n);
+      dict_set_split_vars (dataset_dict (ds), v, n);
       free (v);
     }
 
-  return lex_end_of_command ();
+  return CMD_SUCCESS;
+}
+
+/* Dumps out the values of all the split variables for the case C. */
+void
+output_split_file_values (const struct dataset *ds, const struct ccase *c)
+{
+  const struct dictionary *dict = dataset_dict (ds);
+  size_t n_vars = dict_get_n_splits (dict);
+  if (n_vars == 0)
+    return;
+
+  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++)
+    {
+      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)));
+    }
+
+  pivot_table_submit (table);
 }