From 3496e38e7805aea96441d20565a164ceb27f84c3 Mon Sep 17 00:00:00 2001 From: "kestes%walrus.com" Date: Mon, 6 May 2002 21:03:11 +0000 Subject: [PATCH] fixes --- .../tinderbox2/src/lib/TinderDB/VC_Bonsai.pm | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm b/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm index 3a65d5779b51..2eae16357130 100755 --- a/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm +++ b/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm @@ -40,8 +40,8 @@ # Contributor(s): -# $Revision: 1.42 $ -# $Date: 2002/05/06 20:57:53 $ +# $Revision: 1.43 $ +# $Date: 2002/05/06 21:03:11 $ # $Author: kestes%walrus.com $ # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Bonsai.pm,v $ # $Name: $ @@ -101,7 +101,7 @@ use TreeData; use VCDisplay; -$VERSION = ( qw $Revision: 1.42 $ )[1]; +$VERSION = ( qw $Revision: 1.43 $ )[1]; @ISA = qw(TinderDB::BasicTxtDB); @@ -374,20 +374,24 @@ sub status_table_start { # no data. sub is_break_cell { - my ($tree,$time,$next_time,$last_treestate) = @_; + my ($tree,$time,$next_time) = @_; + + if (defined($DATABASE{$tree}{$time}{'treestate'})) { + $LAST_TREESTATE = $DATABASE{$tree}{$time}{'treestate'}; + } my $is_state1_different = ( (defined($last_treestate)) && (defined($DATABASE{$tree}{$next_time}{'treestate'})) && - ($last_treestate ne $DATABASE{$tree}{$next_time}{'treestate'}) && + ($LAST_TREESTATE ne $DATABASE{$tree}{$next_time}{'treestate'}) && 1); my $is_state2_different = ( (defined($last_treestate)) && (defined($DATABASE{$tree}{$time}{'treestate'})) && - ($last_treestate ne $DATABASE{$tree}{$time}{'treestate'}) && + ($LAST_TREESTATE ne $DATABASE{$tree}{$time}{'treestate'}) && 1); $is_state_different = $is_state1_different || $is_state2_different; @@ -434,16 +438,9 @@ sub status_table_row { $tree, $DB_TIMES[$next_index], $DB_TIMES[$next_index+1], - $LAST_TREESTATE, ) )) { - $next_time = $DB_TIMES[$next_index]; - - if (defined($DATABASE{$tree}{$next_time}{'treestate'})) { - $LAST_TREESTATE = $DATABASE{$next_tree}{$time}{'treestate'}; - } - $next_index++; }