Reimplemented the logo as a svg image and converted to a 64x64 bit icon

[pspp-builds.git] / src / language / stats / rank.q

diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q
index 97c98c32f0613573c04cf23af8b30be329f4398b..2247354dcd337557f2127e0ddbbd84ec599917bf 100644 (file)
--- a/src/language/stats/rank.q
+++ b/src/language/stats/rank.q
@@ -24,10 +24,10 @@
 #include "data/casegrouper.h"
 #include "data/casereader.h"
 #include "data/casewriter.h"
+#include "data/dataset.h"
 #include "data/dictionary.h"
 #include "data/format.h"
 #include "data/missing-values.h"
-#include "data/procedure.h"
 #include "data/short-names.h"
 #include "data/subcase.h"
 #include "data/variable.h"
@@ -198,8 +198,7 @@ fraction_name(void)
 /* Create a label on DEST_VAR, describing its derivation from SRC_VAR and F */
 static void
 create_var_label (struct variable *dest_var,
-                 const struct variable *src_var, enum RANK_FUNC f,
-                  const char *dict_encoding)
+                 const struct variable *src_var, enum RANK_FUNC f)
 {
   struct string label;
   ds_init_empty (&label);
@@ -225,7 +224,7 @@ create_var_label (struct variable *dest_var,
     ds_put_format (&label, _("%s of %s"),
                    function_name[f], var_get_name (src_var));
 
-  var_set_label (dest_var, ds_cstr (&label), dict_encoding, false);
+  var_set_label (dest_var, ds_cstr (&label), false);
 
   ds_destroy (&label);
 }
@@ -280,7 +279,7 @@ rank_cmd (struct dataset *ds, const struct subcase *sc,
         }
       ok = casegrouper_destroy (split_grouper);
       ok = proc_commit (ds) && ok;
-      ok = (proc_set_active_file_data (ds, casewriter_make_reader (output))
+      ok = (dataset_set_source (ds, casewriter_make_reader (output))
             && ok);
       if (!ok)
         break;
@@ -684,8 +683,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds)
 
          create_var_label ( rank_specs[i].destvars[v],
                             src_vars[v],
-                            rank_specs[i].rfunc,
-                             dict_get_encoding (dict));
+                            rank_specs[i].rfunc);
        }
     }
 
@@ -772,7 +770,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds)
   /* Do the ranking */
   result = rank_cmd (ds, &sc, rank_specs, n_rank_specs);
 
-  /* Put the active file back in its original order.  Delete
+  /* Put the active dataset back in its original order.  Delete
      our sort key, which we don't need anymore.  */
   {
     struct casereader *sorted;
@@ -784,7 +782,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds)
     result = proc_commit (ds) && result;
 
     dict_delete_var (dataset_dict (ds), order);
-    result = proc_set_active_file_data (ds, sorted) && result;
+    result = dataset_set_source (ds, sorted) && result;
   }
 
   rank_cleanup();