--- db2gantt.cgi 2002/09/13 13:57:32 1.7 +++ db2gantt.cgi 2002/09/15 19:21:33 1.18 @@ -5,19 +5,20 @@ use Data::Dumper; use Date::Parse; use CGI qw/:standard/; +use CGI::Carp qw(fatalsToBrowser); use POSIX qw(strftime); my $debug = 0; my $width = 600; # width of bar -my $height = 12; # height of bar +my $height = 19; # height of bar my $use_js = 1; # use JavaScript pop-up # status colors my %cols = ( 'In Progress' => '0,255,0', - 'In Progress/Failure' => '255,64,255', - 'In Progress/Errors' => '255,64,0', + 'In Progress/Failures' => '192,64,192', + 'In Progress/Errors' => '255,128,128', 'Queuing' => '255,255,0', 'Aborted' => '255,0,0', 'Failed' => '255,0,0', @@ -25,6 +26,7 @@ 'Completed/Errors' => '255,128,0', 'Completed/Failure' => '128,0,128', 'Mount Request' => '128,128,255', + 'Mount/Errors' => '255,64,128', ); my $int_t = (12 * 60 * 60); # interval to display on one screen @@ -34,14 +36,21 @@ # time range +$int_t = m_round($int_t); + my ($from_t,$to_t) = (time()-$int_t,time()); $to_t = param('to_t') if (param('to_t')); $from_t = param('from_t') if (param('from_t')); # round to nearest minute -$to_t = $to_t - ($to_t % 60); -$from_t = $from_t - ($from_t % 60) + 60; +sub m_round { + my $t = shift @_; + return ($t - ($t % 60)); +} + +$to_t = m_round($to_t); +$from_t = m_round($from_t); my $to=strftime("%Y-%m-%d %H:%M",localtime ($to_t)); my $from=strftime("%Y-%m-%d %H:%M",localtime ($from_t)); @@ -66,10 +75,12 @@ } print "Content-type: text/html +Cache-Control: max-age=60, must-revalidate
-Specification | "; print mknav(($from_t-$int_t),$to_t,'<<'),$from; print mknav(($from_t+$int_t),$to_t,'>>') if ($from_t+$int_t < $to_t); @@ -111,36 +122,89 @@ print mknav($from_t,($to_t-$int_t),'<<') if ($to_t-$int_t > $from_t); print $to,mknav($from_t,($to_t+$int_t),'>>')," | |
hour grid | ";
+ my @c = ("255,255,128","255,192,128");
+ my $hr=strftime("%H",localtime ($from_t));
+ sub hour_bar {
+ my ($t,$c,$hr) = @_;
+ my $clock_hr = $hr % 24;
+ my $alt = sprintf("%02d:00",$clock_hr);
+ if ($clock_hr == 0) {
+ my $pix_hr = int(1 / $width);
+ print color_bar($pix_hr,"0,0,0",strftime("%Y-%m-%d", localtime($from_t + $hr*3600)));
+ print color_bar($t-$pix_hr,$c,$alt);
+ } else {
+ print color_bar($t,$c,$alt);
+ }
+ }
+ hour_bar(3600 - $from_t % 3600,$c[0],$hr++);
+ for (my $i=1; $i | |
", $row->{specification}," | ";
$curr_t = $from_t; # init timeline
@@ -188,11 +253,15 @@
my $start_t = str2time($row->{start});
my $fin_t = str2time($row->{finish});
- if ($start_t > $curr_t) {
+ # Can I squeeze here 1 pixel of time (many seconds) ?
+ if ($start_t > $curr_t + ($len_t / $width)) {
my $t = $start_t - $curr_t;
print STDERR "[middle filler $curr_t:$t]" if ($debug);
print bar($t);
$curr_t = $start_t;
+ } else {
+ # prepend too few seconds to next event
+ $start_t = $curr_t;
}
my $len = $fin_t - $start_t;
@@ -220,6 +289,7 @@
$alt .= $row->{type}." ".$row->{status}." ". $row->{user_group_host}." ".$row->{sessionid}." ". $row->{device}." on ".$row->{host}; +$alt .= "-- ".$row->{specification}; print bar($len,$row->{status},$alt); $curr_t += $len; @@ -241,7 +311,9 @@ undef $sth; $dbh->disconnect; -print " |
status | # | color |
---|---|---|
$status | ",$count{$status}-1," | ",bar($count{$status},$status)," |
$status | ",$count{$status}*1," | ",bar($count{$status},$status)," |
Reload url(-relative=>1),"\">current.
"; +print "\nReload url(-relative=>1),"\">current or see help.