projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Actually implement the new procedure code and adapt all of its clients
[pspp]
/
src
/
language
/
stats
/
sort-cases.c
diff --git
a/src/language/stats/sort-cases.c
b/src/language/stats/sort-cases.c
index 13e0c6edb247024e14541f9e94ca62729cfe6299..913718f476dc54ff6a60892e7e39b6ea3dd1bb5a 100644
(file)
--- a/
src/language/stats/sort-cases.c
+++ b/
src/language/stats/sort-cases.c
@@
-30,6
+30,7
@@
#include <language/lexer/lexer.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <language/lexer/lexer.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
+#include <data/case-ordering.h>
#include <math/sort.h>
#include <sys/types.h>
#include <math/sort.h>
#include <sys/types.h>
@@
-41,13
+42,15
@@
int
cmd_sort_cases (struct lexer *lexer, struct dataset *ds)
{
int
cmd_sort_cases (struct lexer *lexer, struct dataset *ds)
{
- struct sort_criteria *criteria;
- bool success = false;
+ struct case_ordering *ordering;
+ struct casereader *output;
+ bool ok = false;
lex_match (lexer, T_BY);
lex_match (lexer, T_BY);
- criteria = sort_parse_criteria (lexer, dataset_dict (ds), NULL, NULL, NULL, NULL);
- if (criteria == NULL)
+ proc_cancel_temporary_transformations (ds);
+ ordering = parse_case_ordering (lexer, dataset_dict (ds), NULL);
+ if (ordering == NULL)
return CMD_CASCADING_FAILURE;
if (get_testing_mode () && lex_match (lexer, '/'))
return CMD_CASCADING_FAILURE;
if (get_testing_mode () && lex_match (lexer, '/'))
@@
-57,7
+60,6
@@
cmd_sort_cases (struct lexer *lexer, struct dataset *ds)
goto done;
min_buffers = max_buffers = lex_integer (lexer);
goto done;
min_buffers = max_buffers = lex_integer (lexer);
- allow_internal_sort = false;
if (max_buffers < 2)
{
msg (SE, _("Buffer limit must be at least 2."));
if (max_buffers < 2)
{
msg (SE, _("Buffer limit must be at least 2."));
@@
-67,14
+69,17
@@
cmd_sort_cases (struct lexer *lexer, struct dataset *ds)
lex_get (lexer);
}
lex_get (lexer);
}
- success = sort_active_file_in_place (ds, criteria);
+ proc_discard_output (ds);
+ output = sort_execute (proc_open (ds), ordering);
+ ordering = NULL;
+ ok = proc_commit (ds);
+ ok = proc_set_active_file_data (ds, output) && ok;
done:
min_buffers = 64;
max_buffers = INT_MAX;
done:
min_buffers = 64;
max_buffers = INT_MAX;
- allow_internal_sort = true;
-
sort_destroy_criteria (criteria
);
- return
success
? lex_end_of_command (lexer) : CMD_CASCADING_FAILURE;
+
case_ordering_destroy (ordering
);
+ return
ok
? lex_end_of_command (lexer) : CMD_CASCADING_FAILURE;
}
}