projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new output/ascii.h header to the distribution, fixing "make dist".
[pspp]
/
src
/
language
/
stats
/
rank.q
diff --git
a/src/language/stats/rank.q
b/src/language/stats/rank.q
index 97c98c32f0613573c04cf23af8b30be329f4398b..91ef1861366c35d226626315bbef8e52b3afc7ec 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/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/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"
#include "data/short-names.h"
#include "data/subcase.h"
#include "data/variable.h"
@@
-280,7
+280,7
@@
rank_cmd (struct dataset *ds, const struct subcase *sc,
}
ok = casegrouper_destroy (split_grouper);
ok = proc_commit (ds) && ok;
}
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;
&& ok);
if (!ok)
break;
@@
-772,7
+772,7
@@
cmd_rank (struct lexer *lexer, struct dataset *ds)
/* Do the ranking */
result = rank_cmd (ds, &sc, rank_specs, n_rank_specs);
/* 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;
our sort key, which we don't need anymore. */
{
struct casereader *sorted;
@@
-784,7
+784,7
@@
cmd_rank (struct lexer *lexer, struct dataset *ds)
result = proc_commit (ds) && result;
dict_delete_var (dataset_dict (ds), order);
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();
}
rank_cleanup();