cvsuser 02/03/22 15:06:58 Modified: P5EEx/Blue/P5EEx/Blue/Widget/HTML DataTable.pm Log: cleaned up some references to old code Revision Changes Path 1.6 +8 -8 p5ee/P5EEx/Blue/P5EEx/Blue/Widget/HTML/DataTable.pm Index: DataTable.pm =================================================================== RCS file: /cvs/public/p5ee/P5EEx/Blue/P5EEx/Blue/Widget/HTML/DataTable.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -r1.5 -r1.6 --- DataTable.pm 12 Mar 2002 16:54:10 -0000 1.5 +++ DataTable.pm 22 Mar 2002 23:06:57 -0000 1.6 @@ -1,10 +1,10 @@ ###################################################################### -## $Id: DataTable.pm,v 1.5 2002/03/12 16:54:10 spadkins Exp $ +## $Id: DataTable.pm,v 1.6 2002/03/22 23:06:57 spadkins Exp $ ###################################################################### package P5EEx::Blue::Widget::HTML::DataTable; -$VERSION = do { my @r=(q$Revision: 1.5 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r}; +$VERSION = do { my @r=(q$Revision: 1.6 $=~/\d+/g); sprintf "%d."."%02d"x$#r,@r}; use P5EEx::Blue::P5EE; use P5EEx::Blue::Widget::HTML; @@ -324,10 +324,10 @@ sub substitute { my ($self, $text, $values) = @_; - Widget->dbgprint("DataTable->substitute()") - if ($Widget::DEBUG && Widget->dbg(ref($self),"substitute")); - my ($phrase, $var, $value, $controller); - $controller = $self->{controller}; + $self->{context}->dbgprint("DataTable->substitute()") + if ($P5EEx::Blue::DEBUG && $self->{context}->dbg()); + my ($phrase, $var, $value, $context); + $context = $self->{context}; $values = {} if (! defined $values); if (ref($text) eq "HASH") { @@ -350,7 +350,7 @@ } else { if ($var =~ /^(.+)\.([^.]+)$/) { - $value = $controller->wget($1, $2); + $value = $context->wget($1, $2); if (defined $value) { $phrase =~ s/\{$var\}/$value/g; } @@ -379,7 +379,7 @@ else { $value = ""; if ($var =~ /^(.+)\.([^.]+)$/) { - $value = $controller->wget($1, $2); + $value = $context->wget($1, $2); } } $value = "" if (!defined $value);