CROSSTABS: Improve error messages and coding style.

[pspp] / src / language / stats / sort-cases.c

diff --git a/src/language/stats/sort-cases.c b/src/language/stats/sort-cases.c
index ff0f305e9fa911003fede236e5d4d712c5dbca7d..41c7662413c498a902291077e4260d8c339dd3d6 100644 (file)
--- a/src/language/stats/sort-cases.c
+++ b/src/language/stats/sort-cases.c
@@ -16,12 +16,11 @@
 
 #include <config.h>
 
-#include <assert.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "data/procedure.h"
+#include "data/dataset.h"
 #include "data/settings.h"
 #include "data/subcase.h"
 #include "data/variable.h"
@@ -41,43 +40,37 @@
 int
 cmd_sort_cases (struct lexer *lexer, struct dataset *ds)
 {
-  struct subcase ordering;
-  struct casereader *output;
+  struct subcase ordering = SUBCASE_EMPTY_INITIALIZER;
   bool ok = false;
 
   lex_match (lexer, T_BY);
 
   proc_cancel_temporary_transformations (ds);
-  subcase_init_empty (&ordering);
   if (!parse_sort_criteria (lexer, dataset_dict (ds), &ordering, NULL, NULL))
     return CMD_CASCADING_FAILURE;
 
   if (settings_get_testing_mode () && lex_match (lexer, T_SLASH))
     {
-      if (!lex_force_match_id (lexer, "BUFFERS") || !lex_match (lexer, T_EQUALS)
-          || !lex_force_int (lexer))
+      if (!lex_force_match_id (lexer, "BUFFERS"))
+        goto done;
+      lex_match (lexer, T_EQUALS);
+      if (!lex_force_int_range (lexer, "BUFFERS", 2, INT_MAX))
         goto done;
-
       min_buffers = max_buffers = lex_integer (lexer);
-      if (max_buffers < 2)
-        {
-          msg (SE, _("Buffer limit must be at least 2."));
-          goto done;
-        }
-
       lex_get (lexer);
     }
 
   proc_discard_output (ds);
-  output = sort_execute (proc_open (ds), &ordering);
+  struct casereader *output = sort_execute (proc_open_filtering (ds, false),
+                                            &ordering);
   ok = proc_commit (ds);
-  ok = proc_set_active_file_data (ds, output) && ok;
+  ok = dataset_set_source (ds, output) && ok;
 
  done:
   min_buffers = 64;
   max_buffers = INT_MAX;
 
-  subcase_destroy (&ordering);
+  subcase_uninit (&ordering);
   return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE;
 }