X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsplit-file.c;h=ee2fda263d631b447272c2ef6deb17cb6dd41a83;hb=f5c108becd49d78f4898cab11352291f5689d24e;hp=0f648e530399b8cd0109ab3ca88413d4a9fcd2f7;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git

diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c
index 0f648e53..ee2fda26 100644
--- a/src/language/dictionary/split-file.c
+++ b/src/language/dictionary/split-file.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -53,7 +52,7 @@ cmd_split_file (struct lexer *lexer, struct dataset *ds)
 
       /* For now, ignore SEPARATE and LAYERED. */
       (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;
@@ -70,7 +69,7 @@ void
 output_split_file_values (const struct dataset *ds, const struct ccase *c)
 {
   const struct dictionary *dict = dataset_dict (ds);
-  struct variable *const *split;
+  const struct variable *const *split;
   struct tab_table *t;
   size_t split_cnt;
   int i;
@@ -89,19 +88,19 @@ output_split_file_values (const struct dataset *ds, const struct ccase *c)
   split = dict_get_split_vars (dict);
   for (i = 0; i < split_cnt; i++)
     {
-      struct variable *v = split[i];
+      const struct variable *v = split[i];
       char temp_buf[80];
       const char *val_lab;
+      const struct fmt_spec *print = var_get_print_format (v);
+
+      tab_text (t, 0, i + 1, TAB_LEFT | TAT_PRINTF, "%s", var_get_name (v));
+
+      data_out (case_data (c, v), print, temp_buf);
+      temp_buf[print->w] = 0;
 
-      assert (v->type == NUMERIC || v->type == ALPHA);
-      tab_text (t, 0, i + 1, TAB_LEFT | TAT_PRINTF, "%s", v->name);
-      
-      data_out (case_data (c, v->fv), &v->print, temp_buf);
-      
-      temp_buf[v->print.w] = 0;
-      tab_text (t, 1, i + 1, TAT_PRINTF, "%.*s", v->print.w, temp_buf);
+      tab_text (t, 1, i + 1, TAT_PRINTF, "%.*s", print->w, temp_buf);
 
-      val_lab = val_labs_find (v->val_labs, *case_data (c, v->fv));
+      val_lab = var_lookup_value_label (v, case_data (c, v));
       if (val_lab)
 	tab_text (t, 2, i + 1, TAB_LEFT, val_lab);
     }