projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Reimplement for better testability and internationalization.
[pspp-builds.git]
/
src
/
language
/
stats
/
rank.q
diff --git
a/src/language/stats/rank.q
b/src/language/stats/rank.q
index 49a040e3ae0c7facbb87258cf21c8f108e4973b0..97c98c32f0613573c04cf23af8b30be329f4398b 100644
(file)
--- a/
src/language/stats/rank.q
+++ b/
src/language/stats/rank.q
@@
-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);
}
@@
-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));
}
}
}
}