Changeset 386 for trunk

Timestamp:

07/07/10 12:00:37 (11 years ago)

Author:

sander

Message:

When an application has a development and non-development version, only list the non-development version. Fixes #53

File:

• trunk/server/www/app/models/worker.php (modified) (2 diffs)

trunk/server/www/app/models/worker.php

@@ -92 +92 @@
                         WHERE `Factory`.`last_poll` > '$time'
                                 $sqlWhere
-                        ORDER BY `Platform`.`name` ASC, `Application`.`name` ASC, `Worker`.`version` ASC");
+                        ORDER BY `Platform`.`name` ASC, `Application`.`name` ASC, `Worker`.`version`, `Worker`.`development` ASC");
 
                 if (is_array($active)) {
-                        foreach ($active as &$app) {
-                                $app['id'] = $app['Platform']['id'] . '_' . $app['Doctype']['code'] . '_' . $app['Application']['id'] . '_'
-                                           . $app['Worker']['version'];
+                        $prev_ids = array();
+                        $result = array();
+
+                        foreach ($active as $i => $app) {
+                                $active[$i]['id'] = $app['Platform']['id'] . '_' . $app['Doctype']['code'] . '_' . $app['Application']['id'] . '_'
+                                        . $app['Worker']['version'];
+                                
+                                if (in_array($active[$i]['id'], $prev_ids)) {
+                                        // This is a development version of the previous application. Don't list it.
+                                        continue;
+                                }
+                                $prev_ids[] = $active[$i]['id'];
 
                                 $formats = $this->query("SELECT DISTINCT
@@ -116 +125 @@
                                                 AND `DoctypesWorker`.`doctype_id` = '" . $app['Doctype']['id'] . "'");
 
-                                $app['Format'] = array();
+                                $active[$i]['Format'] = array();
                                 foreach ($formats as $format) {
-                                        $app['Format'][] = $format['Format'];
+                                        $active[$i]['Format'][] = $format['Format'];
                                 }
+
+                                $result[] = $active[$i];
                         }
-                        return $active;
+
+                        return $result;
                 }
                 return array();