Changeset 152

Timestamp:

06/21/05 15:01:45 (18 years ago)

Author:

bastiaans

Message:

toga/libtoga.php:

• Only search jobs in 'F' state

toga/search.php:

• Fixed form validation

web/addons/toga/graph.php:

• Added x-grid determination for labels and such along x-axis

Location:

trunk/web/addons/toga

Files:

• graph.php (modified) (2 diffs)
• libtoga.php (modified) (2 diffs)
• search.php (modified) (2 diffs)

trunk/web/addons/toga/graph.php

@@ -329 +329 @@
 //}
 
+function determineXGrid( $p_start, $p_stop ) {
+
+        $period = intval( $p_stop - $p_start );
+
+        // Syntax: <minor_grid_lines_time_declr>:<major_grid_lines_time_declr>:<labels_time_declr>:<offset>:<format>
+        //
+        // Where each <*time_declr*> = <time_type>:<time_interval>
+
+        // Less than 1 minute
+        if( $period < 60 )
+
+                $my_grid = "SECOND:5:SECOND:25:SECOND:25:0:%X";
+
+        // Less than 10 minutes
+        else if( $period < 600 )
+
+                $my_grid = "SECOND:50:MINUTE:1:MINUTE:1:0:%X";
+
+        // Less than 1 hour
+        else if( $period < 3600 )
+
+                $my_grid = "MINUTE:5:MINUTE:10:MINUTE:10:0:%X";
+
+        // Less than 1 day
+        //
+        else if( $period < 86400 ) 
+
+                $my_grid = "HOUR:1:HOUR:2:HOUR:2:0:%X";
+
+        // Less than 15 days
+        //
+        else if( $period < 1296000 )
+
+                $my_grid = "HOUR:30:DAY:1:DAY:1:0:%x";
+                
+        // Less than 30 days (a month)
+        //
+        elseif( $period < 2592000 )
+
+                $my_grid = "DAY:5:DAY:10:DAY:10:0:%x";
+
+        if( isset( $my_grid ) )
+
+                return "--x-grid $my_grid";
+
+        else
+                return "";
+}
+
+$xgrid = determineXGrid( $period_start, $period_stop );
+
 #
 # Generate the rrdtool graph command.
@@ -334 +385 @@
 $command = RRDTOOL . " graph - --start $period_start --end $period_stop ".
         "--width $width --height $height $upper_limit $lower_limit ".
-        "--title '$title' $vertical_label $extras $background ".
+        "--title '$title' $vertical_label $extras $background $xgrid ".
         $series;
 

trunk/web/addons/toga/libtoga.php

@@ -108 +108 @@
 
                 if( $id ) 
-                        $query = "SELECT job_id FROM jobs WHERE job_id = '$id'";
+                        $query = "SELECT job_id FROM jobs WHERE job_id = '$id' AND job_status = 'F'";
                 else {
                         $query_args = array();
@@ -127 +127 @@
                                 $query_args[] = "job_stop_timestamp <= $end_to_time";
 
-                        $query = "SELECT job_id FROM jobs WHERE ";
+                        $query = "SELECT job_id FROM jobs WHERE job_status = 'F' AND ";
                         $extra_query_args = '';
 

trunk/web/addons/toga/search.php

@@ -11 +11 @@
         $none_set = 0;
 
-        if( $id == '' or $user == '' or $name == '' or $start_from_time == '' or $start_to_time == '' or $queue == '' or $end_from_time == '' or $end_to_time == '') $none_set = 1;
-
-        if (!isset($id) and !isset($user) and !isset($start_from_time) and !isset($start_to_time) and !isset($end_from_time) and !isset($end_to_time) and !isset($queue) ) $none_set = 1;
-
-        if( $none_set == 1 ) {
+        if( $id == '' and $user == '' and $name == '' and $start_from_time == '' and $start_to_time == '' and $queue == '' and $end_from_time == '' and $end_to_time == '') {
                 $error = 1;
                 $error_msg = "<FONT COLOR=\"red\"><B>No search criteria set!</B></FONT>";
+        }
+
+        if( !is_numeric($id) and !$error and $id != '') {
+
+                $error = 1;
+                $error_msg = "<FONT COLOR=\"red\"><B>Id must be a number</B></FONT>";
         }
 
@@ -347 +349 @@
                                                 $textval = "$val[VAL] $val[UNITS]";
                                         } else {
-                                                $graphargs = "z=small&c=$cluster_url&m=$metricname&h=$host_url&v=$val[VAL]&x=$max&n=$min&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
+                                                $graphargs = "z=small&c=$cluster_url&m=$metricname&h=$host_url&v=$val[VAL]&x=$max&n=$min&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop&min=$min&max=$max";
                                         }
                                         if ($textval) {