projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Continue reforming procedure execution. In this phase, get rid of
[pspp-builds.git]
/
src
/
language
/
stats
/
rank.q
diff --git
a/src/language/stats/rank.q
b/src/language/stats/rank.q
index dc0b9ddd8969276097569a7015a7da8f2192f0b0..d3ac8edd6eb502a895992189d08fe03a8452142f 100644
(file)
--- a/
src/language/stats/rank.q
+++ b/
src/language/stats/rank.q
@@
-19,11
+19,15
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
+#include "sort-criteria.h"
+#include <data/dictionary.h>
+#include <procedure.h>
+#include <data/variable.h>
#include <language/command.h>
#include <language/command.h>
+#include <language/stats/sort-criteria.h>
#include <libpspp/compiler.h>
#include <libpspp/compiler.h>
-#include <data/dictionary.h>
#include <math/sort.h>
#include <math/sort.h>
-#include <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-239,12
+243,12
@@
parse_rank_function(struct cmd_rank *cmd UNUSED, enum RANK_FUNC f)
++var_count;
if ( dict_lookup_var (default_dict, tokid) != NULL )
{
++var_count;
if ( dict_lookup_var (default_dict, tokid) != NULL )
{
- msg(
M
E, _("Variable %s already exists."), tokid);
+ msg(
S
E, _("Variable %s already exists."), tokid);
return 0;
}
if ( var_count > sc->crit_cnt )
{
return 0;
}
if ( var_count > sc->crit_cnt )
{
- msg(
M
E, _("Too many variables in INTO clause."));
+ msg(
S
E, _("Too many variables in INTO clause."));
return 0;
}
return 0;
}