Changeset 880 for branches/1.0/web/addons/job_monarch/libtoga.php

Timestamp:

05/18/13 18:25:10 (11 years ago)

Author:

ramonb

Message:

libtoga.php:

• allow searchDbase query to include running jobs

templates/search.tpl:

• added "include running jobs" checkbox

search.php:

• pass include running option submit to searchDbase
• some modifications to start/stop times for running jobs
• closes #167

File:

• branches/1.0/web/addons/job_monarch/libtoga.php (modified) (3 diffs)

branches/1.0/web/addons/job_monarch/libtoga.php

@@ -211 +211 @@
     }
 
-    function searchDbase( $id = null, $queue = null, $owner = null, $name = null, $start_from_time = null, $start_to_time = null, $end_from_time = null, $end_to_time = null )
+    function searchDbase( $id = null, $queue = null, $owner = null, $name = null, $start_from_time = null, $start_to_time = null, $end_from_time = null, $end_to_time = null, $include_running = false )
     {
         global $SEARCH_RESULT_LIMIT;
 
+        if( $include_running )
+        {
+            $status_query = " AND job_status != 'Q'";
+        }
+        else
+        {
+            $status_query = " AND job_status = 'F'";
+        }
+
         if( $id )
         {
-            $select_query = "SELECT job_id FROM jobs WHERE job_id = '$id' AND job_status = 'F'";
+            $select_query = "SELECT job_id FROM jobs WHERE job_id = '$id'" . $status_query;
             $this->resultcount = 1;
         }
@@ -253 +262 @@
             }
 
-            $query = "FROM jobs WHERE job_status = 'F' AND ";
+            $query = "FROM jobs WHERE ";
             $extra_query_args = '';
 
@@ -267 +276 @@
                 }
             }
-            $query .= $extra_query_args;
+            $query .= $extra_query_args . $status_query;
 
             $count_result_idname = "COUNT(job_id)";