From 9b4eff7284cea357be2fad1caca382fc107e6796 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 21 May 2007 15:06:43 +0000
Subject: [PATCH] - feeder: the query change of 13 April broke the
 -random_order,     -priority_order, -priority_order_create_time,and -mod
 options     (from Nicolas Maire)

sched/
    feeder.C

svn path=/trunk/boinc/; revision=12703
---
 checkin_notes  | 8 ++++++++
 sched/feeder.C | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 6e8a66f1ea..8644424c38 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -5111,3 +5111,11 @@ David  21 May 2007
 
     client/
         client_state.C
+
+David  21 May 2007
+    - feeder: the query change of 13 April broke the -random_order,
+        -priority_order, -priority_order_create_time,and -mod options
+        (from Nicolas Maire)
+
+    sched/
+        feeder.C
diff --git a/sched/feeder.C b/sched/feeder.C
index 2721a84e10..9ca690cd14 100644
--- a/sched/feeder.C
+++ b/sched/feeder.C
@@ -524,19 +524,19 @@ int main(int argc, char** argv) {
         if (!strcmp(argv[i], "-d")) {
             log_messages.set_debug_level(atoi(argv[++i]));
         } else if (!strcmp(argv[i], "-random_order")) {
-            order_clause = "order by random ";
+            order_clause = "order by r1.random ";
         } else if (!strcmp(argv[i], "-allapps")) {
             all_apps = true;
         } else if (!strcmp(argv[i], "-priority_order")) {
-            order_clause = "order by result.priority desc ";
+            order_clause = "order by r1.result.priority desc ";
         } else if (!strcmp(argv[i], "-priority_order_create_time")) {
-            order_clause = "order by result.priority desc, workunit.create_time ";
+            order_clause = "order by r1.result.priority desc, workunit.create_time ";
         } else if (!strcmp(argv[i], "-purge_stale")) {
             purge_stale_time = atoi(argv[++i])*60;
         } else if (!strcmp(argv[i], "-mod")) {
             int n = atoi(argv[++i]);
             int j = atoi(argv[++i]);
-            sprintf(select_clause, "and result.id %% %d = %d ", n, j);
+            sprintf(select_clause, "and r1.result.id %% %d = %d ", n, j);
         } else if (!strcmp(argv[i], "-sleep_interval")) {
             sleep_interval = atof(argv[++i]);
         } else {