--- db2gantt.cgi 2002/09/13 11:59:08 1.5 +++ db2gantt.cgi 2002/09/13 18:35:50 1.11 @@ -5,11 +5,14 @@ use Data::Dumper; use Date::Parse; use CGI qw/:standard/; +use CGI::Carp qw(fatalsToBrowser); use POSIX qw(strftime); -my $debug = 1; -my $width = 600; -my $use_js = 1; +my $debug = 0; + +my $width = 600; # width of bar +my $height = 12; # height of bar +my $use_js = 1; # use JavaScript pop-up # status colors my %cols = ( @@ -23,21 +26,34 @@ '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 +my $min_l = 3; # min length of bar segment (in pixels) + #--- no user servicable parts below this line # time range -my $day_t = (24 * 60 * 60); # 24h interval +$int_t = m_round($int_t); -my ($from_t,$to_t) = (time()-$day_t,time()); +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')); -my $to=strftime("%Y-%m-%d %H:%M:%S",localtime ($to_t)); -my $from=strftime("%Y-%m-%d %H:%M:%S",localtime ($from_t)); +# round to nearest minute +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)); # keep count of each status @@ -47,7 +63,7 @@ print "Content-type: image/png\nCache-Control: max-age=3600, must-revalidate\n\n"; # create picture using GD use GD; - my $im = new GD::Image(1,8); + my $im = new GD::Image(1,$height); my $back = $im->colorAllocate(255,255,255); $im->transparent($back); my ($r,$g,$b) = split(/,/,param('pic')); @@ -98,43 +114,72 @@ print "
Specification | "; -print mknav(($from_t-$day_t),$to_t,'<<'),$from; -print mknav(($from_t+$day_t),$to_t,'>>') if ($from_t+$day_t < $to_t); +print mknav(($from_t-$int_t),$to_t,'<<'),$from; +print mknav(($from_t+$int_t),$to_t,'>>') if ($from_t+$int_t < $to_t); print " | "; -print mknav($from_t,($to_t-$day_t),'<<') if ($to_t-$day_t > $from_t); -print $to,mknav($from_t,($to_t+$day_t),'>>')," |
hour grid | ";
+ my @c = ("255,255,128","255,192,128");
+ my $hr=strftime("%H",localtime ($from_t));
+ print color_bar(3600 - $from_t % 3600,$c[0],sprintf("%02d",$hr++ % 24));
+ for (my $i=1; $i | |
", $row->{specification}," | ";
$curr_t = $from_t; # init timeline
@@ -178,12 +224,12 @@
}
- my $start_t = str2time($row->{start});
- my $fin_t = str2time($row->{finish});
+ my $start_t = m_round(str2time($row->{start}));
+ my $fin_t = m_round(str2time($row->{finish}));
- if ($start_t > $curr_t) {
+ if ($start_t > $curr_t + 60) {
my $t = $start_t - $curr_t;
- print STDERR "[filler $curr_t:$t]" if ($debug);
+ print STDERR "[middle filler $curr_t:$t]" if ($debug);
print bar($t);
$curr_t = $start_t;
}
@@ -199,8 +245,6 @@
$less = "<<";
}
- next if ($fin_t > $to_t);
-
if ($fin_t > $to_t) {
# $len -= ($fin_t - $to_t);
$len = ($to_t - $curr_t);
@@ -209,10 +253,12 @@
print STDERR "[$less",$row->{status}," $curr_t:$len$more]" if ($debug);
- my $alt = $row->{start}." - ".$row->{finish}." ". - $row->{type}." ".$row->{status}." ". - $row->{user_group_host}." ".$row->{sessionid}.""; + my $alt = $row->{start}." - ".$row->{finish}." "; $alt =~ s/:\d\d\.\d+//g; + $alt =~ s/\s+/ /g; + $alt .= $row->{type}." ".$row->{status}." ". + $row->{user_group_host}." ".$row->{sessionid}." ". + $row->{device}." on ".$row->{host}; print bar($len,$row->{status},$alt); $curr_t += $len; @@ -221,16 +267,22 @@ } +if ($curr_t == $from_t) { # no entries in database! + print " | |
"; +} + if ($curr_t < $to_t ) { my $t = $to_t - $curr_t; - print STDERR "[filler $curr_t:$t]" if ($debug); + print STDERR "[last_line filler $curr_t:$t]" if ($debug); print bar($t); } undef $sth; $dbh->disconnect; -print " |
status | # | color |
---|---|---|
$status | ",$count{$status}," | ",bar($count{$status},$status)," |
$status | ",$count{$status}*1," | ",bar($count{$status},$status)," |