Changeset 337 for trunk

Timestamp:

03/29/10 13:36:34 (11 years ago)

Author:

sander

Message:

Different ordering of jobs. Sort by locked time to keep them cycling

File:

• trunk/server/www/app/controllers/jobs_controller.php (modified) (2 diffs)

trunk/server/www/app/controllers/jobs_controller.php

@@ -505 +505 @@
                                 ORDER BY `Request`.`own_factory` DESC,
                                         `Request`.`priority` ASC,
+                                        `Job`.`locked` ASC,
                                         `Request`.`created` ASC
                                 LIMIT 0,1");
@@ -565 +566 @@
                 }
 
-                // If the priorities are also equal, look at the creation date
-                return ($a['Request']['created'] < $b['Request']['created']) ? -1 : 1;
+                // If the priorities are also equal, look at the locked time
+                return ($a['Job']['locked'] < $b['Job']['locked']) ? -1 : 1;
         }