Ignore:
Timestamp:
03/29/13 17:15:20 (11 years ago)
Author:
ramonb
Message:
  • more fixes to search
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.4/web/addons/job_monarch/search.php

    r776 r778  
    3333    global $end_from_time, $end_to_time, $period_start, $period_stop, $tpl_data;
    3434
    35     $error = 0;
     35    $error = false;
    3636    $error_msg = "<FONT COLOR=\"red\"><B>";
    3737    $show_msg = 0;
     
    4040
    4141    if( $id == '' and $owner== '' and $name == '' and $start_from_time == '' and $start_to_time == '' and $queue == '' and $end_from_time == '' and $end_to_time == '') {
    42         $error = 1;
     42        $error = true;
    4343        $show_msg = 1;
    4444        $error_msg .= "No search criteria set!";
     
    4848    {
    4949
    50         $error = 1;
     50        $error = true;
    5151        $show_msg = 1;
    5252        $error_msg .= "Id must be a number";
     
    6464
    6565                $show_msg = 1;
     66                $error = true;
    6667                $error_msg .= "Graph timeperiod reset: start date/time can't be later than end";
    6768                $period_stop = '';
     
    7071
    7172                $show_msg = 1;
     73                $error = true;
    7274                $error_msg .= "Graph timeperiod reset: start and end date/time can't be the same";
    7375                $period_stop = '';
     
    7880
    7981    $error_msg .= "</B></FONT>";
    80     // doe checks en set error en error_msg in case shit
    81 
    82     //if( $show_msg )
    83         //$tpl_data->assign( "form_error_msg", $error_msg );
    84 
    85     return ($error ? 0 : 1 );
     82
     83    return array( $error_msg, $error);
    8684}
    8785
     
    256254    $tpl_data->assign( "end_to_value", rawurldecode( $end_to_time ) );
    257255
    258     if( validateFormInput() ) {
    259 
     256    list( $form_error_msg, $form_error ) = validateFormInput();
     257
     258    if( $form_error == true )
     259    {
     260        $tpl_data->assign( "form_error_msg", $form_error_msg );
     261    }
     262    else if( $form_error == false )
     263    {
    260264        $tpl_data->assign( "search_results", "yes" );
    261265        $tpl_data->assign( "sortby", $sortby);
     
    268272        $search_ids = $tdb->searchDbase( $id, $queue, $owner, $name, $start_from_time, $start_to_time, $end_from_time, $end_to_time );
    269273
     274        //print_r( $search_ids );
    270275        if( ($tdb->resultcount) > (int) $SEARCH_RESULT_LIMIT ) {
    271         
     276       
    272277            $tpl_data->assign( "form_error_msg", "Got " . $tdb->resultcount . " search results, output limited to last " . $SEARCH_RESULT_LIMIT . " jobs." );
    273278        }
     
    350355            $node_loop[]=$node_list;
    351356        }
    352         $tpl_data->assign("node_loop", $node_loop );
     357        //print_r( $node_loop );
     358        $tpl_data->assign("node_list", $node_loop );
    353359
    354360        if( count( $search_ids ) == 1 ) {
     
    463469                    $sorted_loop[]=$sorted_list;
    464470                }
    465                 $tpl_data->assign("sorted_loop", $sorted_loop );
    466 
     471                $tpl_data->assign("sorted_list", $sorted_loop );
    467472            }
    468473        }
Note: See TracChangeset for help on using the changeset viewer.