Ignore:
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
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/web/addons/job_monarch/search.php

    r247 r248  
    325325        global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up;
    326326        global $period_start, $period_stop, $sortby, $sortorder, $COLUMN_REQUESTED_MEMORY;
     327        global $SEARCH_RESULT_LIMIT;
    327328
    328329        $metricname = $m;
     
    351352                if( $end_to_time ) $end_to_time = datetimeToEpoch( $end_to_time );
    352353                $search_ids = $tdb->searchDbase( $id, $queue, $user, $name, $start_from_time, $start_to_time, $end_from_time, $end_to_time );
     354
     355                if( ($tdb->resultcount) > (int) $SEARCH_RESULT_LIMIT ) {
     356                        $tpl->gotoBlock( "_ROOT" );
     357               
     358                        $tpl->assign( "form_error_msg", "Got " . $tdb->resultcount . " search results, output limited to last " . $SEARCH_RESULT_LIMIT . " jobs." );
     359                        $tpl->gotoBlock( "search_results" );
     360                }
    353361
    354362                $jobs = array();
Note: See TracChangeset for help on using the changeset viewer.