--- db2gantt.cgi	2002/09/16 15:29:00	1.21
+++ db2gantt.cgi	2002/09/18 14:00:18	1.22
@@ -269,32 +269,64 @@
 	print "</td></tr>";
 }
 
+my @line_t;	# all seconds for this specification
+my @line_arr = ("");	# all segments on line which are not fillers
+
+sub html_spec {
+	print "<tr><td>$curr_spec</td><td colspan=2>";
+
+	my $last_var = 0;
+	my $len = 0;
+	my $i;
+	for (my $t=0; $t<=$len_t; $t++) {
+		$i = $line_t[$t] || 0;
+		if ($i == $last_var) {
+			$len++;
+		} else {
+			if ($last_var == 0) {
+				print bar($len);
+			} else {
+				print bar($len,split(/\t/,$line_arr[$last_var],2));
+			}
+			$len = 0;
+			$last_var = $i;
+		}
+	}
+	print bar($len,split(/\t/,$line_arr[$i],2));
+
+	print "</td></tr>\n";
+}
+
 while(my $row = $sth->fetchrow_hashref) {
-	if (!defined $curr_spec || $row->{specification} ne $curr_spec) {
+	if ($row->{specification} ne $curr_spec) {
 
 		if ($curr_t < $to_t && $curr_spec) {
 			my $t = $to_t - $curr_t;
 			print STDERR "[end filler $curr_t:$t]" if ($debug);
-			print bar($t);
+#			print bar($t);
 		}
 
-		print "</td></tr>\n" if ($curr_t != $from_t);
+#		print "</td></tr>\n" if ($curr_t != $from_t);
 
-		if ($dev && @dev_t && $dev ne $row->{device}) {
-			sum_bar("summary for $dev",@dev_t);
-			$dev = $row->{device};
-			@dev_t = ();
-		} elsif (! $dev) {
-			$dev = $row->{device};
-		}
 
 		# init vars for next line
 		($fix_s,$fix_d) = (0,0); # init fix vars for bar
-		print "<tr><td>", $row->{specification},"</td><td colspan=2>";
+
+		html_spec if ($curr_spec ne "");
 
 		$curr_t = $from_t;	# init timeline
 		$curr_spec = $row->{specification};
 
+		@line_t = ();
+		@line_arr = ( "" );
+
+		if ($dev && @dev_t && $dev ne $row->{device}) {
+			sum_bar("summary for $dev",@dev_t);
+			$dev = $row->{device};
+			@dev_t = ();
+		} elsif (! $dev) {
+			$dev = $row->{device};
+		}
 	}
 
 	my $start_t = str2time($row->{start});
@@ -304,7 +336,7 @@
 	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);
+#		print bar($t);
 		$curr_t = $start_t;
 	} else {
 		# prepend too few seconds to next event
@@ -337,10 +369,12 @@
 		$row->{type}." <b>".$row->{status}."</b><br>".
 		$row->{user_group_host}." <i>".$row->{sessionid}."</i><br>".
 		$row->{device}."&nbsp;on&nbsp;".$row->{host};
-	print bar($len,$row->{status},$alt);
+#	print bar($len,$row->{status},$alt);
 
+	push @line_arr,$row->{status}."\t".$alt;
 	# store use of devices for each minute
 	for (my $s=0; $s<$len; $s++) {
+		$line_t[$curr_t-$from_t+$s] = $#line_arr;
 		$dev_t[$curr_t-$from_t+$s]++;
 		$dev_sum_t[$curr_t-$from_t+$s]++;
 	}
@@ -352,19 +386,18 @@
 }
 
 if ($curr_t == $from_t) {	# no entries in database!
-	print "<tr><td></td><td colspan=2>";
+#	print "<tr><td></td><td colspan=2>";
 }
 
 if ($curr_t < $to_t ) {
 	my $t = $to_t - $curr_t;
 	print STDERR "[last_line filler $curr_t:$t]" if ($debug);
-	print bar($t);
 }
 
 undef $sth;
 $dbh->disconnect;
 
-print "</td></tr>\n";
+html_spec();
 sum_bar("summary for $dev",@dev_t);
 hour_grid();
 sum_bar("summary for all devices",@dev_sum_t);