Changeset 2411

Timestamp:

03/28/08 18:44:17 (10 months ago)

Author:

david

Message:

merge [2410]

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/config/AgaviCachingConfigHandler.class.php (modified) (2 diffs)
• src/config/xsd/caching.xsd (modified) (2 diffs)
• src/filter/AgaviExecutionFilter.class.php (modified) (2 diffs)

trunk/CHANGELOG

@@ -18 +18 @@
 0.11.1 RC3 (March ??, 2008)
 ---------------------------
+
+ADD: Add ability to cache complete request attribute namespaces in Execution Filter (#740) (David)
 
 CHG: Update timezone database to 2008b (#728) (David)

trunk/src/config/AgaviCachingConfigHandler.class.php

@@ -123 +123 @@
             }
             
+            $requestAttributeNamespaces = array();
+            if(isset($outputType->request_attribute_namespaces)) {
+              foreach($outputType->request_attribute_namespaces as $requestAttributeNamespace) {
+                $requestAttributeNamespaces[] = $requestAttributeNamespace->getValue();
+              }
+            }
+            
             $otnames = array_map('trim', explode(' ', $outputType->getAttribute('name', '*')));
             foreach($otnames as $otname) {
@@ -129 +136 @@
                 'template_variables' => $templateVariables,
                 'request_attributes' => $requestAttributes,
+                'request_attribute_namespaces' => $requestAttributeNamespaces,
               );
             }

trunk/src/config/xsd/caching.xsd

@@ -100 +100 @@
     <xs:sequence maxOccurs="unbounded">
       <xs:group ref="request_attributes" />
+      <xs:group ref="request_attribute_namespaces" />
       <xs:group ref="template_variables" />
       <xs:group ref="layers" />
@@ -123 +124 @@
       </xs:extension>
     </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:group name="request_attribute_namespaces">
+    <xs:choice>
+      <xs:element name="request_attribute_namespaces" type="request_attribute_namespaces" minOccurs="0" />
+      <xs:element name="request_attribute_namespace" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:choice>
+  </xs:group>
+  <xs:complexType name="request_attribute_namespaces">
+    <xs:sequence>
+      <xs:element name="request_attribute_namespace" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
   </xs:complexType>
 

trunk/src/filter/AgaviExecutionFilter.class.php

@@ -391 +391 @@
           foreach($viewCache['request_attributes'] as $requestAttribute) {
             $request->setAttribute($requestAttribute['name'], $requestAttribute['value'], $requestAttribute['namespace']);
+          }
+          
+          foreach($viewCache['request_attribute_namespaces'] as $ranName => $ranValues) {
+            $request->setAttributes($ranValues, $ranName);
           }
 
@@ -499 +503 @@
             $viewCache['request_attributes'][] = $requestAttribute + array('value' => $request->getAttribute($requestAttribute['name'], $requestAttribute['namespace']));
           }
+          foreach($otConfig['request_attribute_namespaces'] as $requestAttributeNamespace) {
+            $viewCache['request_attribute_namespaces'][$requestAttributeNamespace] = $request->getAttributes($requestAttributeNamespace);
+          }
 
           $this->writeCache(array_merge($groups, array($outputType)), $viewCache, $config['lifetime']);