[svn:p5ee] r6497 - p5ee/trunk/App-Widget/lib/App

Author: spadkins
Date: Mon Jun 12 12:29:46 2006
New Revision: 6497

Modified:
   p5ee/trunk/App-Widget/lib/App/TemplateEngine.pm

Log:
changed the way the default values are determined for substitution

Modified: p5ee/trunk/App-Widget/lib/App/TemplateEngine.pm
==============================================================================
--- p5ee/trunk/App-Widget/lib/App/TemplateEngine.pm	(original)
+++ p5ee/trunk/App-Widget/lib/App/TemplateEngine.pm	Mon Jun 12 12:29:46 2006
@@ -231,21 +231,15 @@
     &App::sub_entry if ($App::trace);
     my ($self) = @_;
 
-    #my ($session, %values);
-    #$session = $self->{context}->session();
+    my $context = $self->{context};
+    my $values = $context->session_object("default");
 
-    #if (defined $session->{cache}{SessionObject}{session} &&
-    #    ref($session->{cache}{SessionObject}{session}) eq "HASH") {
-    #    %values = %{$session->{cache}{SessionObject}{session}}; # make a copy
+    #my (%values);
+    #%values = %$values if ($values);
+    #my $options = $context->{options};
+    #foreach my $key (keys %$options) {
+    #    $values{$key} = $options->{$key} if (!defined $values{$key});
     #}
-    #if (defined $session->{cache}{SessionObject} && ref($session->{cache}{SessionObject}) eq "HASH") {
-    #    $values{SESSIONOBJECT} = $session->{cache}{SessionObject};  # add ref to higher level
-    #}
-    #if (defined $session->{cache} && ref($session->{cache}) eq "HASH") {
-    #    $values{SESSION} = $session->{cache};         # add ref to higher level
-    #}
-
-    my $values = $self->{context}->options();
 
     &App::sub_exit($values) if ($App::trace);
     return($values);
@@ -277,6 +271,7 @@
     my ($phrase, $var, $value, $context, $expand);
     $context = $self->{context};
     $values = {} if (! defined $values);
+    my $options = $context->{options};
 
     while ( $template_text =~ /\[%(\+?)([^%]+)%\]/ ) {  # vars of the form [%var%] or [%+var%]
         $expand = $1;
@@ -290,10 +285,11 @@
         elsif (defined $values->{$var}) {
             $value = $values->{$var};
         }
+        elsif (defined $options->{$var}) {
+            $value = $options->{$var};
+        }
         else {
-            $value = $context->so_get($var);
-            $value = $values->{$var} if (!defined $value);
-            $value = "" if (!defined $value);
+            $value = "";
         }
         $template_text =~ s/\[%\+$var%\]/$value/g;
     }
@@ -310,10 +306,11 @@
         elsif (defined $values->{$var}) {
             $value = $values->{$var};
         }
+        elsif (defined $options->{$var}) {
+            $value = $options->{$var};
+        }
         else {
-            $value = $context->so_get($var);
-            $value = $values->{$var} if (!defined $value);
-            $value = "" if (!defined $value);
+            $value = "";
         }
         $template_text =~ s/\{$var\}/$value/g;
     }