--- db2gantt.cgi 2002/09/13 11:59:08 1.5 +++ db2gantt.cgi 2002/09/13 22:48:19 1.13 @@ -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 = 19; # 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')); @@ -96,45 +112,86 @@ return "url(-relative=>1)."?from_t=${f}&to_t=${t}\">$ch"; } -print ""; +print "
"; print "\n"; +print mknav($from_t,($to_t-$int_t),'<<') if ($to_t-$int_t > $from_t); +print $to,mknav($from_t,($to_t+$int_t),'>>'),"\n"; + +# draw hour grid +sub hour_grid { + print "\n"; +} + +hour_grid(); -my $fix_d = 0; # used to fix graph len -my $min_l = 3; # min length; +my $fix_d = 0; # used to fix graph len (in pixels) +my $fix_s = 0; # used to collect round errors of size sub bar { - my $l = shift @_; # lenght of event utime - my $status = shift @_ || undef; # what to draw + my $l = shift @_; + my $status = shift @_; + my $alt = shift @_; + + my $col; + + if ($status) { + if ($cols{$status}) { + $col .= $cols{$status}; + } else { + $col .= "0,0,0"; # unknown status, black + } + $count{$status}++; + } else { +# $col .= '240,240,240'; + $col .= '220,220,220'; + } + return color_bar($l,$col,$alt,$min_l); +} + +sub color_bar { + my $l = shift @_; # lenght of event utime + my $col = shift @_ || '240,240,240'; # default color (filler) my $alt = shift @_ || undef; + my $min_l = shift @_ || 1; - my $size = int($l / ($len_t / $width)); - if ($size < $min_l) { + my $size = $l / ($len_t / $width); + $fix_s += $size - int($size); + $size=int($size); + # add rounding error to size + if ($fix_s > 1) { + my $i = $fix_s ; $i = int($i); + $fix_s -= $i; + $size += $i; + } + + if ($alt && $size < $min_l) { + $fix_d += ($min_l - $size); + print STDERR "fix_d: $fix_d\n" if ($debug); $size = $min_l; - $fix_d += $min_l; } if ($fix_d && $size > $fix_d+$min_l) { $size -= $fix_d; $fix_d = 0; + print STDERR "fix_d: $fix_d\n" if ($debug); } - print STDERR "l[$status]:$l scale:",($len_t/$width)," size:$size
alt:$alt\n" if ($debug); - - my $html = "url(-relative=>1)."?pic="; + print STDERR "bar[$col] len:$l s scale:",($len_t/$width)," size:$size px
alt:$alt\n" if ($debug); - if ($status) { - $html .= $cols{$status}; - $count{$status}++; - } else { -# $html .= '240,240,240'; - $html .= '220,220,220'; - } + my $html = "url(-relative=>1)."?pic=$col\" width=\"$size\" height=\"$height\""; - $html .= "\" width=\"$size\" height=\"12\""; if ($use_js && $alt) { $html .= " onmouseover=\"T('$alt')\" onmouseout=\"T()\""; } elsif ($alt) { @@ -145,11 +202,12 @@ return($html); } -my $sql = "select start,finish,specification,status,user_group_host,type,sessionid +my $sql = "select start,finish,specification,status,user_group_host, + type,sessionid,device,host from gantt where (start < '$from' and finish > '$from') or (start > '$from' and start < '$to') - order by specification + order by device,specification "; my $sth = $dbh->prepare($sql) || die "sql: $sql ".$dbh->errstr; @@ -162,15 +220,16 @@ $sth->execute() || die "sql: $sql ".$dbh->errstr; while(my $row = $sth->fetchrow_hashref) { - if ($row->{specification} ne $curr_spec) { + if (!defined $curr_spec || $row->{specification} ne $curr_spec) { if ($curr_t < $to_t && $curr_spec) { my $t = $to_t - $curr_t; - print STDERR "[filler $curr_t:$t]" if ($debug); + print STDERR "[end filler $curr_t:$t]" if ($debug); print bar($t); } - print "\n" if ($curr_t != 0); + print "\n" if ($curr_t != $from_t); + ($fix_s,$fix_d) = (0,0); # init fix vars for bar print "\n
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)); + my $min_l=1; + 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 @@ -181,9 +240,10 @@ 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 "[filler $curr_t:$t]" if ($debug); + print STDERR "[middle filler $curr_t:$t]" if ($debug); print bar($t); $curr_t = $start_t; } @@ -199,8 +259,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 +267,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 +281,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 "
"; +print "\n"; +hour_grid(); +print ""; # label and usage @@ -240,7 +306,11 @@ print "\n"; foreach my $status (keys %count) { #foreach my $status (keys %cols) { - print "\n" if ($status ne ""); + print "\n" if ($status ne ""); + # *1 in line above is a cludge to display correct number on + # occurences on graph and without one on legend! If you remove * op + # it will first evaluate bar sub (thus increasing number by one) and + # then display number (wrongly). } -print "
status#color
$status",$count{$status},"",bar($count{$status},$status),"
$status",$count{$status}*1,"",bar($count{$status},$status),"
\n"; +print "\n

Reload url(-relative=>1),"\">current.

";