Index: trunk/web/addons/toga/index.php =================================================================== --- trunk/web/addons/toga/index.php (revision 139) +++ trunk/web/addons/toga/index.php (revision 140) @@ -38,4 +38,5 @@ global $metrics, $reports, $m, $default_metric; global $default_refresh, $filterorder, $view; + global $TARCHD; if( isset($default_metric) and !isset($m) ) @@ -209,4 +210,11 @@ $m = $metricname; + if( $TARCHD ) { + $tpl->newBlock( "search" ); + $tpl->assignGlobal( "cluster_url", rawurlencode($clustername) ); + $tpl->assignGlobal( "cluster", $clustername ); + $tpl->gotoBlock( "_ROOT" ); + } + # Make sure that no data is cached.. header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); # Date in the past @@ -242,11 +250,4 @@ } -function includeSearchThumb() { - global $tpl; - - $tpl->assignInclude( "archive", "templates/inc_search.tpl" ); - -} - function includeOverview() { global $tpl; @@ -264,6 +265,4 @@ includeOverview(); - if( $TARCHD ) - includeSearchThumb(); break; Index: trunk/web/addons/toga/libtoga.php =================================================================== --- trunk/web/addons/toga/libtoga.php (revision 139) +++ trunk/web/addons/toga/libtoga.php (revision 140) @@ -141,5 +141,11 @@ $ids = $this->queryDbase( $query ); - print_r($ids); + + $ret = array(); + + foreach( $ids as $crow) + $ret[] = $crow[job_id]; + + return $ret; } Index: trunk/web/addons/toga/overview.php =================================================================== --- trunk/web/addons/toga/overview.php (revision 139) +++ trunk/web/addons/toga/overview.php (revision 140) @@ -2,4 +2,6 @@ global $GANGLIA_PATH, $clustername, $tpl, $filter, $cluster, $get_metric_string, $cluster_url, $sh; global $hosts_up, $m, $start, $end, $filterorder; + +//$tpl->assign("_ROOT.summary", "" ); $data_gatherer = new DataGatherer(); Index: trunk/web/addons/toga/search.php =================================================================== --- trunk/web/addons/toga/search.php (revision 139) +++ trunk/web/addons/toga/search.php (revision 140) @@ -32,5 +32,5 @@ function makeSearchPage() { global $clustername, $tpl, $id, $user, $name, $start_from_time, $start_to_time, $queue; - global $end_from_time, $end_to_time; + global $end_from_time, $end_to_time, $filter; $tpl->assign( "cluster", $clustername ); @@ -46,7 +46,19 @@ if( validateFormInput() ) { + $tpl->newBlock( "search_results" ); $tdb = new TarchDbase(); - $tdb->searchDbase( $id, $queue, $user, $name, $start_from_time, $start_to_time, $end_from_time, $end_to_time ); - $tpl->assign( "search_results", "templates/search_results.tpl" ); + $search_ids = $tdb->searchDbase( $id, $queue, $user, $name, $start_from_time, $start_to_time, $end_from_time, $end_to_time ); + + foreach( $search_ids as $foundid ) { + + printf("found job %s\n", $foundid ); + //output jobzooi + + } + + if( count( $search_ids ) == 1 ) { + + $tpl->newBlock( "showhosts" ); + } // show search results Index: trunk/web/addons/toga/templates/header.tpl =================================================================== --- trunk/web/addons/toga/templates/header.tpl (revision 139) +++ trunk/web/addons/toga/templates/header.tpl (revision 140) @@ -40,5 +40,13 @@ {alt_view} - + + +
Id | +State | +User | +Queue | +Name | +Req. CPU time | +Req. Memory | +Nodes/Cpus +B> | +Started | +Finished | +Runningtime | +
---|---|---|---|---|---|---|---|---|---|---|
{id} | +{state} | +{user} | +{queue} | +{name} | +{req_cpu} | +{req_memory} | +{nodes}/{cpus} | +{started} | +{finished} | +{runningtime} | +
+
+ Show Hosts:
+ yes
+ no
+
+ |
+ job {id} metric {metric}
+ |
+
+ Columns {cols_menu}
+ + + + + Set graph timeperiod from to + + |
+
+(Nodes colored by 1-minute load) | Legend + +