X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Frank.q;h=eb16f3113b9b3396b6096e1bfd7898f345a2e19d;hb=9e24f9a5c52650da0700066e8d9e72261c6492ad;hp=ec3052c0acee616def219464aa7bf19edfec4550;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp-builds.git diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q index ec3052c0..eb16f311 100644 --- a/src/language/stats/rank.q +++ b/src/language/stats/rank.q @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 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 @@ -16,28 +16,27 @@ #include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include "data/case.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/short-names.h" +#include "data/subcase.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/stats/sort-criteria.h" +#include "libpspp/compiler.h" +#include "libpspp/taint.h" +#include "math/sort.h" +#include "output/tab.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -199,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, - 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); @@ -225,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)); - var_set_label (dest_var, ds_cstr (&label)); + var_set_label (dest_var, ds_cstr (&label), dict_encoding, false); ds_destroy (&label); } @@ -280,7 +280,7 @@ rank_cmd (struct dataset *ds, const struct subcase *sc, } 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; @@ -674,15 +674,18 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) 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] = - create_rank_variable (dataset_dict(ds), rank_specs[i].rfunc, src_vars[v], NULL); + create_rank_variable (dict, rank_specs[i].rfunc, src_vars[v], NULL); } create_var_label ( rank_specs[i].destvars[v], src_vars[v], - rank_specs[i].rfunc); + rank_specs[i].rfunc, + dict_get_encoding (dict)); } } @@ -781,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_set_active_file_data (ds, sorted) && result; + result = dataset_set_source (ds, sorted) && result; } rank_cleanup(); @@ -796,9 +799,9 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) static int rank_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cmd UNUSED, void *aux UNUSED) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); - if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) == NULL) + if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokcstr (lexer)) == NULL) && lex_token (lexer) != T_ALL) return 2; @@ -808,7 +811,7 @@ rank_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_rank if ( lex_match (lexer, T_BY) ) { - if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) == NULL)) + if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokcstr (lexer)) == NULL)) { return 2; } @@ -847,9 +850,9 @@ parse_rank_function (struct lexer *lexer, struct dictionary *dict, struct cmd_ra while( lex_token (lexer) == T_ID ) { - if ( dict_lookup_var (dict, lex_tokid (lexer)) != NULL ) + if ( dict_lookup_var (dict, lex_tokcstr (lexer)) != NULL ) { - msg(SE, _("Variable %s already exists."), lex_tokid (lexer)); + msg(SE, _("Variable %s already exists."), lex_tokcstr (lexer)); return 0; } if ( var_count >= subcase_get_n_fields (&sc) ) @@ -858,7 +861,7 @@ parse_rank_function (struct lexer *lexer, struct dictionary *dict, struct cmd_ra return 0; } - destvar = create_rank_variable (dict, f, src_vars[var_count], lex_tokid (lexer)); + destvar = create_rank_variable (dict, f, src_vars[var_count], lex_tokcstr (lexer)); rank_specs[n_rank_specs - 1].destvars[var_count] = destvar ; lex_get (lexer); @@ -932,13 +935,13 @@ rank_custom_ntiles (struct lexer *lexer, struct dataset *ds, struct cmd_rank *cm { struct dictionary *dict = dataset_dict (ds); - if ( lex_force_match (lexer, '(') ) + if ( lex_force_match (lexer, T_LPAREN) ) { if ( lex_force_int (lexer) ) { k_ntiles = lex_integer (lexer); lex_get (lexer); - lex_force_match (lexer, ')'); + lex_force_match (lexer, T_RPAREN); } else return 0;