[wellwell-devel] [wellwell/zoom] Adjust Zoom Compose modules to recent change in Template::Zoom regarding database object.

Stefan Hornburg wellwell-devel at rt.icdevgroup.org
Tue Nov 2 17:58:05 UTC 2010


commit 715c4d51c27142b5e6ff0b1af8d92e55bb7acfe9
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Tue Nov 2 18:55:17 2010 +0100

    Adjust Zoom Compose modules to recent change in Template::Zoom regarding database object.

 lib/WellWell/Compose/Component/Zoom.pm |    4 +++-
 lib/WellWell/Compose/Engine/Zoom.pm    |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/lib/WellWell/Compose/Component/Zoom.pm b/lib/WellWell/Compose/Component/Zoom.pm
index cb5de05..67f3f1b 100644
--- a/lib/WellWell/Compose/Component/Zoom.pm
+++ b/lib/WellWell/Compose/Component/Zoom.pm
@@ -26,6 +26,8 @@ use Template::Zoom;
 use Template::Zoom::Specification::XML;
 use Template::Zoom::HTML;
 
+use Template::Zoom::Database::Rose;
+
 use WellWell::Filter::Link;
 
 sub new {
@@ -64,7 +66,7 @@ sub process {
 	$filters{link} = \&WellWell::Filter::Link::filter;
 		
 	$zoom = new Template::Zoom (template => $html_object, filters => \%filters,
-								dbh => $self->{dbh});
+								database => $self->{database});
 
 	return $zoom->process($attributes);
 }
diff --git a/lib/WellWell/Compose/Engine/Zoom.pm b/lib/WellWell/Compose/Engine/Zoom.pm
index eb29ba7..6719b1a 100644
--- a/lib/WellWell/Compose/Engine/Zoom.pm
+++ b/lib/WellWell/Compose/Engine/Zoom.pm
@@ -28,6 +28,8 @@ sub new {
 	my $class = shift;
 	my $self = {@_};
 
+	$self->{database} = new Template::Zoom::Database::Rose(dbh => $self->{dbh});
+	
 	bless $self;
 	return $self;
 }	
@@ -38,7 +40,7 @@ sub locate_component {
 	
 	if (-f "$::Variable->{MV_COMPONENT_DIR}/$name.xml"
 		&& -f "$::Variable->{MV_COMPONENT_DIR}/$name.html") {
-		%component_hash = (dbh => $self->{dbh},
+		%component_hash = (database => $self->{database},
 						   name => $name,
 						   specification => "$::Variable->{MV_COMPONENT_DIR}/$name.xml",
 						   template => "$::Variable->{MV_COMPONENT_DIR}/$name.html");



More information about the wellwell-devel mailing list