--- db2gantt.cgi 2002/09/13 11:59:08 1.5 +++ db2gantt.cgi 2002/09/13 13:57:32 1.7 @@ -7,9 +7,11 @@ use CGI qw/:standard/; 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 = ( @@ -25,19 +27,24 @@ 'Mount Request' => '128,128,255', ); +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 - -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 +$to_t = $to_t - ($to_t % 60); +$from_t = $from_t - ($from_t % 60) + 60; + +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 +54,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,14 +105,13 @@ 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"; my $fix_d = 0; # used to fix graph len -my $min_l = 3; # min length; sub bar { my $l = shift @_; # lenght of event utime @@ -122,7 +128,7 @@ $fix_d = 0; } - print STDERR "l[$status]:$l scale:",($len_t/$width)," size:$size
alt:$alt\n" if ($debug); + print STDERR "bar[$status] len:$l s scale:",($len_t/$width)," size:$size px
alt:$alt\n" if ($debug); my $html = "url(-relative=>1)."?pic="; @@ -134,7 +140,7 @@ $html .= '220,220,220'; } - $html .= "\" width=\"$size\" height=\"12\""; + $html .= "\" width=\"$size\" height=\"$height\""; if ($use_js && $alt) { $html .= " onmouseover=\"T('$alt')\" onmouseout=\"T()\""; } elsif ($alt) { @@ -145,11 +151,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 +169,15 @@ $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); 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),'>>'),"
", $row->{specification},""; $curr_t = $from_t; # init timeline @@ -183,7 +190,7 @@ if ($start_t > $curr_t) { 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 +206,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 +214,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,9 +228,13 @@ } +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); } @@ -240,7 +251,9 @@ 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! } -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.

";