X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fautorecode.c;h=dcd0a14d76fc1a0330774032cf35b3d3aaab8226;hb=5905c43031658415a3d013e1572bd70e734e3813;hp=e0b5773909bd7f5c50ad69afb99d8fa714d8b593;hpb=335b56abf229fcb446c2311b2a64faf5f64e5a38;p=pspp

diff --git a/src/language/stats/autorecode.c b/src/language/stats/autorecode.c
index e0b5773909..dcd0a14d76 100644
--- a/src/language/stats/autorecode.c
+++ b/src/language/stats/autorecode.c
@@ -36,6 +36,7 @@
 #include "libpspp/message.h"
 #include "libpspp/pool.h"
 #include "libpspp/str.h"
+#include "output/pivot-table.h"
 
 #include "gl/xalloc.h"
 #include "gl/c-xvasprintf.h"
@@ -44,8 +45,7 @@
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
-
-/* FIXME: Implement PRINT subcommand. */
+#define N_(msgid) (msgid)
 
 /* Explains how to recode one value. */
 struct arc_item
@@ -64,8 +64,11 @@ struct arc_spec
   {
     int width;                  /* Variable width. */
     int src_idx;                /* Case index of source variable. */
+    char *src_name;             /* Name of source variable. */
+    struct fmt_spec format;     /* Print format in source variable. */
     struct variable *dst;       /* Target variable. */
     struct missing_values mv;   /* Missing values of source variable. */
+    char *label;                /* Variable label of source variable. */
     struct rec_items *items;
   };
 
@@ -125,6 +128,7 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds)
   size_t n_dsts = 0;
 
   enum arc_direction direction = ASCENDING;
+  bool print = false;
 
   /* Create procedure. */
   struct autorecode_pgm *arc = xzalloc (sizeof *arc);
@@ -170,9 +174,7 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds)
       if (lex_match_id (lexer, "DESCENDING"))
         direction = DESCENDING;
       else if (lex_match_id (lexer, "PRINT"))
-        {
-          /* Not yet implemented. */
-        }
+        print = true;
       else if (lex_match_id (lexer, "GROUP"))
         group = true;
       else if (lex_match_id (lexer, "BLANK"))
@@ -239,6 +241,11 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds)
 
       spec->width = var_get_width (src_vars[i]);
       spec->src_idx = var_get_case_index (src_vars[i]);
+      spec->src_name = xstrdup (var_get_name (src_vars[i]));
+      spec->format = *var_get_print_format (src_vars[i]);
+
+      const char *label = var_get_label (src_vars[i]);
+      spec->label = label ? xstrdup (label) : NULL;
 
       if (group && i > 0)
         spec->items = arc->specs[0].items;
@@ -322,21 +329,24 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds)
   for (size_t i = 0; i < arc->n_specs; i++)
     {
       struct arc_spec *spec = &arc->specs[i];
-      struct arc_item **items;
-      struct arc_item *item;
-      size_t n_items;
-      size_t j;
 
       /* Create destination variable. */
       spec->dst = dict_create_var_assert (dict, dst_names[i], 0);
+      var_set_label (spec->dst, spec->label);
+
+      /* Set print format. */
+      size_t n_items = hmap_count (&spec->items->ht);
+      char *longest_value = xasprintf ("%zu", n_items);
+      struct fmt_spec format = { .type = FMT_F, .w = strlen (longest_value) };
+      var_set_both_formats (spec->dst, &format);
+      free (longest_value);
 
       /* Create array of pointers to items. */
-      n_items = hmap_count (&spec->items->ht);
-      items = xmalloc (n_items * sizeof *items);
-      j = 0;
+      struct arc_item **items = xmalloc (n_items * sizeof *items);
+      struct arc_item *item;
+      size_t j = 0;
       HMAP_FOR_EACH (item, struct arc_item, hmap_node, &spec->items->ht)
         items[j++] = item;
-
       assert (j == n_items);
 
       /* Sort array by value. */
@@ -346,6 +356,51 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds)
       for (j = 0; j < n_items; j++)
         items[j]->to = j + 1;
 
+      if (print && (!group || i == 0))
+        {
+          struct pivot_value *title
+            = (group
+               ? pivot_value_new_text (N_("Recoding grouped variables."))
+               : spec->label && spec->label[0]
+               ? pivot_value_new_text_format (N_("Recoding %s into %s (%s)."),
+                                              spec->src_name,
+                                              var_get_name (spec->dst),
+                                              spec->label)
+               : pivot_value_new_text_format (N_("Recoding %s into %s."),
+                                              spec->src_name,
+                                              var_get_name (spec->dst)));
+          struct pivot_table *table = pivot_table_create__ (title);
+
+          pivot_dimension_create (
+            table, PIVOT_AXIS_COLUMN, N_("Attributes"),
+            N_("New Value"), N_("Value Label"));
+
+          struct pivot_dimension *old_values = pivot_dimension_create (
+            table, PIVOT_AXIS_ROW, N_("Old Value"));
+          old_values->root->show_label = true;
+
+          for (size_t k = 0; k < n_items; k++)
+            {
+              const struct arc_item *item = items[k];
+              int old_value_idx = pivot_category_create_leaf (
+                old_values->root, pivot_value_new_value (
+                  &item->from, item->width,
+                  (item->width
+                   ? &(struct fmt_spec) { FMT_F, item->width, 0 }
+                   : &spec->format),
+                  dict_get_encoding (dict)));
+              pivot_table_put2 (table, 0, old_value_idx,
+                                pivot_value_new_integer (item->to));
+
+              const char *value_label = item->value_label;
+              if (value_label && value_label[0])
+                pivot_table_put2 (table, 1, old_value_idx,
+                                  pivot_value_new_user_text (value_label, -1));
+            }
+
+          pivot_table_submit (table);
+        }
+
       /* Assign user-missing values.
 
          User-missing values in the source variable(s) must be marked
@@ -430,6 +485,8 @@ arc_free (struct autorecode_pgm *arc)
               hmap_delete (&spec->items->ht, &item->hmap_node);
               free (item);
             }
+          free (spec->label);
+          free (spec->src_name);
           mv_destroy (&spec->mv);
         }