From 204c1e7673bc37beb3b5f8fa809a7863c2fdda6e Mon Sep 17 00:00:00 2001 From: johnkeis Date: Wed, 12 Feb 2003 22:05:18 +0000 Subject: [PATCH] Pass in patch strings so that Patch fields will print correctly --- webtools/tinderbox3/scripts/Tinderbox3/TreeColumns.pm | 7 ++++--- webtools/tinderbox3/server/Tinderbox3/TreeColumns.pm | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/webtools/tinderbox3/scripts/Tinderbox3/TreeColumns.pm b/webtools/tinderbox3/scripts/Tinderbox3/TreeColumns.pm index ca0d4e1e53e..a8d7dc4b8d3 100644 --- a/webtools/tinderbox3/scripts/Tinderbox3/TreeColumns.pm +++ b/webtools/tinderbox3/scripts/Tinderbox3/TreeColumns.pm @@ -13,7 +13,7 @@ sub new { bless $this, $class; my ($start_time, $end_time, $tree, $field_short_names, $field_processors, - $field_handlers, + $field_handlers, $patch_str, $machine_id, $machine_name, $os, $os_version, $compiler, $clobber) = @_; $this->{START_TIME} = $start_time; @@ -28,6 +28,7 @@ sub new { $this->{OS_VERSION} = $os_version; $this->{COMPILER} = $compiler; $this->{CLOBBER} = $clobber; + $this->{PATCH_STR} = $patch_str; $this->{AT_START} = 1; $this->{STARTED_PRINTING} = 0; @@ -275,7 +276,7 @@ EOM # Method to get a the TreeColumns objects for a tree # sub get_tree_column_queues { - my ($p, $dbh, $start_time, $end_time, $tree, $field_short_names, $field_processors, $field_handlers) = @_; + my ($p, $dbh, $start_time, $end_time, $tree, $field_short_names, $field_processors, $field_handlers, $patch_str) = @_; # # Get the list of machines # @@ -284,7 +285,7 @@ sub get_tree_column_queues { my %columns; while (my $row = $sth->fetchrow_arrayref) { - $columns{$row->[0]} = new Tinderbox3::TreeColumns($start_time, $end_time, $tree, $field_short_names, $field_processors, $field_handlers, @{$row}); + $columns{$row->[0]} = new Tinderbox3::TreeColumns($start_time, $end_time, $tree, $field_short_names, $field_processors, $field_handlers, $patch_str, @{$row}); } if (!keys %columns) { diff --git a/webtools/tinderbox3/server/Tinderbox3/TreeColumns.pm b/webtools/tinderbox3/server/Tinderbox3/TreeColumns.pm index ca0d4e1e53e..a8d7dc4b8d3 100644 --- a/webtools/tinderbox3/server/Tinderbox3/TreeColumns.pm +++ b/webtools/tinderbox3/server/Tinderbox3/TreeColumns.pm @@ -13,7 +13,7 @@ sub new { bless $this, $class; my ($start_time, $end_time, $tree, $field_short_names, $field_processors, - $field_handlers, + $field_handlers, $patch_str, $machine_id, $machine_name, $os, $os_version, $compiler, $clobber) = @_; $this->{START_TIME} = $start_time; @@ -28,6 +28,7 @@ sub new { $this->{OS_VERSION} = $os_version; $this->{COMPILER} = $compiler; $this->{CLOBBER} = $clobber; + $this->{PATCH_STR} = $patch_str; $this->{AT_START} = 1; $this->{STARTED_PRINTING} = 0; @@ -275,7 +276,7 @@ EOM # Method to get a the TreeColumns objects for a tree # sub get_tree_column_queues { - my ($p, $dbh, $start_time, $end_time, $tree, $field_short_names, $field_processors, $field_handlers) = @_; + my ($p, $dbh, $start_time, $end_time, $tree, $field_short_names, $field_processors, $field_handlers, $patch_str) = @_; # # Get the list of machines # @@ -284,7 +285,7 @@ sub get_tree_column_queues { my %columns; while (my $row = $sth->fetchrow_arrayref) { - $columns{$row->[0]} = new Tinderbox3::TreeColumns($start_time, $end_time, $tree, $field_short_names, $field_processors, $field_handlers, @{$row}); + $columns{$row->[0]} = new Tinderbox3::TreeColumns($start_time, $end_time, $tree, $field_short_names, $field_processors, $field_handlers, $patch_str, @{$row}); } if (!keys %columns) {