X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Frank.q;h=ec3052c0acee616def219464aa7bf19edfec4550;hb=3da49359c52cb783db907cc197847bbd5e721c97;hp=3bbd39d1e0b0ea26ff7c1b78d67a2db35b5d8f4f;hpb=deb4fd96c0c171fc8eb64f7f1e7f5c2af4931416;p=pspp

diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q
index 3bbd39d1e0..ec3052c0ac 100644
--- a/src/language/stats/rank.q
+++ b/src/language/stats/rank.q
@@ -35,8 +35,7 @@
 #include <libpspp/compiler.h>
 #include <libpspp/taint.h>
 #include <math/sort.h>
-#include <output/manager.h>
-#include <output/table.h>
+#include <output/tab.h>
 
 #include <gsl/gsl_cdf.h>
 
@@ -249,7 +248,7 @@ rank_cmd (struct dataset *ds, const struct subcase *sc,
 
       proc_discard_output (ds);
       split_grouper = casegrouper_create_splits (proc_open (ds), d);
-      output = autopaging_writer_create (dict_get_next_value_idx (d));
+      output = autopaging_writer_create (dict_get_proto (d));
 
       while (casegrouper_get_next_group (split_grouper, &split_group))
         {
@@ -692,7 +691,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds)
       int v;
 
       tab_output_text (0, _("Variables Created By RANK"));
-      tab_output_text (0, "\n");
+      tab_output_text (0, "");
 
       for (i = 0 ; i <  n_rank_specs ; ++i )
 	{
@@ -714,48 +713,44 @@ cmd_rank (struct lexer *lexer, struct dataset *ds)
 
 		  if ( rank_specs[i].rfunc == NORMAL ||
 		       rank_specs[i].rfunc == PROPORTION )
-		    tab_output_text (TAT_PRINTF,
-				     _("%s into %s(%s of %s using %s BY %s)"),
-				     var_get_name (src_vars[v]),
-				     var_get_name (rank_specs[i].destvars[v]),
-				     function_name[rank_specs[i].rfunc],
-				     var_get_name (src_vars[v]),
-				     fraction_name(),
-				     ds_cstr (&varlist)
-				     );
+		    tab_output_text_format (0,
+                                            _("%s into %s(%s of %s using %s BY %s)"),
+                                            var_get_name (src_vars[v]),
+                                            var_get_name (rank_specs[i].destvars[v]),
+                                            function_name[rank_specs[i].rfunc],
+                                            var_get_name (src_vars[v]),
+                                            fraction_name(),
+                                            ds_cstr (&varlist));
 
 		  else
-		    tab_output_text (TAT_PRINTF,
-				     _("%s into %s(%s of %s BY %s)"),
-				     var_get_name (src_vars[v]),
-				     var_get_name (rank_specs[i].destvars[v]),
-				     function_name[rank_specs[i].rfunc],
-				     var_get_name (src_vars[v]),
-				     ds_cstr (&varlist)
-				     );
+		    tab_output_text_format (0,
+                                            _("%s into %s(%s of %s BY %s)"),
+                                            var_get_name (src_vars[v]),
+                                            var_get_name (rank_specs[i].destvars[v]),
+                                            function_name[rank_specs[i].rfunc],
+                                            var_get_name (src_vars[v]),
+                                            ds_cstr (&varlist));
 		  ds_destroy (&varlist);
 		}
 	      else
 		{
 		  if ( rank_specs[i].rfunc == NORMAL ||
 		       rank_specs[i].rfunc == PROPORTION )
-		    tab_output_text (TAT_PRINTF,
-				     _("%s into %s(%s of %s using %s)"),
-				     var_get_name (src_vars[v]),
-				     var_get_name (rank_specs[i].destvars[v]),
-				     function_name[rank_specs[i].rfunc],
-				     var_get_name (src_vars[v]),
-				     fraction_name()
-				     );
+		    tab_output_text_format (0,
+                                            _("%s into %s(%s of %s using %s)"),
+                                            var_get_name (src_vars[v]),
+                                            var_get_name (rank_specs[i].destvars[v]),
+                                            function_name[rank_specs[i].rfunc],
+                                            var_get_name (src_vars[v]),
+                                            fraction_name());
 
 		  else
-		    tab_output_text (TAT_PRINTF,
-				     _("%s into %s(%s of %s)"),
-				     var_get_name (src_vars[v]),
-				     var_get_name (rank_specs[i].destvars[v]),
-				     function_name[rank_specs[i].rfunc],
-				     var_get_name (src_vars[v])
-				     );
+		    tab_output_text_format (0,
+                                            _("%s into %s(%s of %s)"),
+                                            var_get_name (src_vars[v]),
+                                            var_get_name (rank_specs[i].destvars[v]),
+                                            function_name[rank_specs[i].rfunc],
+                                            var_get_name (src_vars[v]));
 		}
 	    }
 	}