Changeset 141 for trunk/web/addons/toga/libtoga.php

Timestamp:

06/16/05 11:22:29 (18 years ago)

Author:

bastiaans

Message:

web/addons/toga/libtoga.php:

• Fixed couple of dbase selecting bugs

web/addons/toga/cal.gif:

• Image for date/time selector

web/addons/toga/templates/search.tpl:

• Removed bogus/wrong extra hidden fields messing up the search (leftover from overview template)

web/addons/toga/ts_picker.js:

• javascript for calendar date/time selector

web/addons/toga/libtoga.js:

• Our misc. javascript functions

web/addons/toga/bricks.jpg:

• Image for archive link

web/addons/toga/search.php:

• Now displays jobs of search in same manner as overview

web/addons/toga/ts_validatetime.js:

• javascript to validate time in calendar

File:

• trunk/web/addons/toga/libtoga.php (modified) (5 diffs)

trunk/web/addons/toga/libtoga.php

@@ -158 +158 @@
                 foreach( $result as $result_row ) 
 
-                        $nodes[] = $this->getNodeArray( $result_row['id'] );
+                        $nodes[] = $this->getNodeArray( $result_row[node_id] );
 
                 return $nodes;
@@ -171 +171 @@
                 foreach( $result as $result_row )
 
-                        $jobs[] = $this->getJobArray( $result_row['id'] );
+                        $jobs[] = $this->getJobArray( $result_row[job_id] );
 
                 return $jobs;
@@ -197 +197 @@
                         $map_key = explode( '_', $mykey );
 
-                        $newkey = $map_key[1];
+                        $rmap_key = array_reverse( $map_key );
+                        array_pop( $rmap_key );
+                        $map_key = array_reverse( $rmap_key );
+                        
+                        $newkey = implode( '_', $map_key );
                         
                         $myar[$newkey] = $result_row[$mykey];
@@ -212 +216 @@
                         $this->connect();
 
+                printf( "query = [%s]\n", $query );
                 $result = pg_query( $this->conn, $query );
 
@@ -294 +299 @@
 
         function graph( $descr ) {
+//      monitor2:/data/toga/rrds/LISA Cluster/gb-r15n11.irc.sara.nl# rrdtool graph /var/www/ganglia/test1.png --start 1118683231 --end 1118750431 --width 300 --height 400 DEF:'1'='./1118647515/load_one.rrd':'sum':AVERAGE DEF:'2'='./1118690723/load_one.rrd':'sum':AVERAGE DEF:'3'='./1118733925/load_one.rrd':'sum':AVERAGE AREA:1#555555:"load_one" AREA:2#555555 AREA:3#555555
+//      380x461
+//      monitor2:/data/toga/rrds/LISA Cluster/gb-r15n11.irc.sara.nl#
                 //$command = $this->rrdbin . " graph - --start $start --end $end ".
                         "--width $width --height $height $upper_limit $lower_limit ".