projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change terminology from "active file" to "active dataset".
[pspp-builds.git]
/
src
/
language
/
stats
/
rank.q
diff --git
a/src/language/stats/rank.q
b/src/language/stats/rank.q
index 49a040e3ae0c7facbb87258cf21c8f108e4973b0..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"
@@
-198,7
+198,8
@@
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,
/* 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 struct variable *src_var, enum RANK_FUNC f,
+ const char *dict_encoding)
{
struct string label;
ds_init_empty (&label);
{
struct string label;
ds_init_empty (&label);
@@
-224,7
+225,7
@@
create_var_label (struct variable *dest_var,
ds_put_format (&label, _("%s of %s"),
function_name[f], var_get_name (src_var));
ds_put_format (&label, _("%s of %s"),
function_name[f], var_get_name (src_var));
- var_set_label (dest_var, ds_cstr (&label));
+ var_set_label (dest_var, ds_cstr (&label)
, dict_encoding, false
);
ds_destroy (&label);
}
ds_destroy (&label);
}
@@
-279,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;
@@
-673,15
+674,18
@@
cmd_rank (struct lexer *lexer, struct dataset *ds)
int v;
for ( v = 0 ; v < n_src_vars ; v ++ )
{
int v;
for ( v = 0 ; v < n_src_vars ; v ++ )
{
+ struct dictionary *dict = dataset_dict (ds);
+
if ( rank_specs[i].destvars[v] == NULL )
{
rank_specs[i].destvars[v] =
if ( rank_specs[i].destvars[v] == NULL )
{
rank_specs[i].destvars[v] =
- create_rank_variable (d
ataset_dict(ds)
, rank_specs[i].rfunc, src_vars[v], NULL);
+ create_rank_variable (d
ict
, rank_specs[i].rfunc, src_vars[v], NULL);
}
create_var_label ( rank_specs[i].destvars[v],
src_vars[v],
}
create_var_label ( rank_specs[i].destvars[v],
src_vars[v],
- rank_specs[i].rfunc);
+ rank_specs[i].rfunc,
+ dict_get_encoding (dict));
}
}
}
}
@@
-768,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;
@@
-780,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();