Changeset 248 for trunk

Timestamp:

04/11/06 15:07:28 (18 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• added SEARCH_RESULT_LIMIT option to prevent HUGE result lists

web/addons/job_monarch/libtoga.php:

• added a resultcount
• changed sql query to count first and limit the results

web/addons/job_monarch/search.php:

• added extra message when results are limited

Location:

trunk/web/addons/job_monarch

Files:

• conf.php (modified) (1 diff)
• libtoga.php (modified) (3 diffs)
• search.php (modified) (2 diffs)

trunk/web/addons/job_monarch/conf.php

@@ -3 +3 @@
 //
 $default_showhosts = 1;
+
+// Stop displaying archive search results after SEARCH_RESULT_LIMIT
+//
+$SEARCH_RESULT_LIMIT = 20;
 
 // Show the column job attribute 'requested memory'?

trunk/web/addons/job_monarch/libtoga.php

@@ -142 +142 @@
         function searchDbase( $id = null, $queue = null, $user = null, $name = null, $start_from_time = null, $start_to_time = null, $end_from_time = null, $end_to_time = null ) {
 
+                global $SEARCH_RESULT_LIMIT;
+
                 if( $id ) 
                         $query = "SELECT job_id FROM jobs WHERE job_id = '$id' AND job_status = 'F'";
@@ -162 +164 @@
                                 $query_args[] = "job_stop_timestamp <= $end_to_time";
 
-                        $query = "SELECT job_id FROM jobs WHERE job_status = 'F' AND ";
+                        $query = "FROM jobs WHERE job_status = 'F' AND ";
                         $extra_query_args = '';
 
@@ -175 +177 @@
                 }
 
-                $ids = $this->queryDbase( $query );
+                $count_result_idname = "COUNT(job_id)";
+                $select_result_idname = "job_id";
+
+                $count_query = "SELECT " . $count_result_idname . " " . $query;
+
+                $count_result = $this->queryDbase( $count_query );
+                $this->resultcount = (int) $count_result[0][count];
+
+                $select_query = "SELECT " . $select_result_idname . " " . $query . " ORDER BY job_id LIMIT " . $SEARCH_RESULT_LIMIT;
+                $ids = $this->queryDbase( $select_query );
 
                 $ret = array();

trunk/web/addons/job_monarch/search.php

@@ -325 +325 @@
         global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up;
         global $period_start, $period_stop, $sortby, $sortorder, $COLUMN_REQUESTED_MEMORY;
+        global $SEARCH_RESULT_LIMIT;
 
         $metricname = $m;
@@ -351 +352 @@
                 if( $end_to_time ) $end_to_time = datetimeToEpoch( $end_to_time );
                 $search_ids = $tdb->searchDbase( $id, $queue, $user, $name, $start_from_time, $start_to_time, $end_from_time, $end_to_time );
+
+                if( ($tdb->resultcount) > (int) $SEARCH_RESULT_LIMIT ) {
+                        $tpl->gotoBlock( "_ROOT" );
+                
+                        $tpl->assign( "form_error_msg", "Got " . $tdb->resultcount . " search results, output limited to last " . $SEARCH_RESULT_LIMIT . " jobs." );
+                        $tpl->gotoBlock( "search_results" );
+                }
 
                 $jobs = array();