/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
-#include <data/case-ordering.h>
+#include <data/subcase.h>
#include <math/sort.h>
#include <sys/types.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
int
cmd_sort_cases (struct lexer *lexer, struct dataset *ds)
{
- struct case_ordering *ordering;
+ struct subcase ordering;
struct casereader *output;
bool ok = false;
lex_match (lexer, T_BY);
proc_cancel_temporary_transformations (ds);
- ordering = parse_case_ordering (lexer, dataset_dict (ds), NULL);
- if (ordering == NULL)
+ subcase_init_empty (&ordering);
+ if (!parse_sort_criteria (lexer, dataset_dict (ds), &ordering, NULL, NULL))
return CMD_CASCADING_FAILURE;
- if (get_testing_mode () && lex_match (lexer, '/'))
+ if (settings_get_testing_mode () && lex_match (lexer, T_SLASH))
{
- if (!lex_force_match_id (lexer, "BUFFERS") || !lex_match (lexer, '=')
+ if (!lex_force_match_id (lexer, "BUFFERS") || !lex_match (lexer, T_EQUALS)
|| !lex_force_int (lexer))
goto done;
}
proc_discard_output (ds);
- output = sort_execute (proc_open (ds), ordering);
- ordering = NULL;
+ output = sort_execute (proc_open (ds), &ordering);
ok = proc_commit (ds);
ok = proc_set_active_file_data (ds, output) && ok;
min_buffers = 64;
max_buffers = INT_MAX;
- case_ordering_destroy (ordering);
+ subcase_destroy (&ordering);
return ok ? lex_end_of_command (lexer) : CMD_CASCADING_FAILURE;
}