Changeset 957

Timestamp:

10/04/07 02:35:41 (9 months ago)

Author:

mikey

Message:

fixed bug: stop processing if a page element cancelled the request

Files:

• trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php (modified) (2 diffs)
• trunk/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php (modified) (1 diff)

trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php

@@ -107 +107 @@
-                $prefixRequest->setPrefix($defaultElement->getName());
-                $content .= $this->processElement($defaultElement, $prefixRequest, $context);
+                if ($prefixRequest->isCancelled() === true) {
+                    return;
+                }
-            }
-            
@@ -112 +115 @@
-                $prefixRequest->setPrefix($name);
-                $content .= $this->processElement($element, $prefixRequest, $context);
+                if ($prefixRequest->isCancelled() === true) {
+                    return;
+                }
-            }
-            

trunk/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php

@@ -64 +64 @@
-        foreach ($elements as $name => $element) {
-            $prefixRequest->setPrefix($name);
+            if ($injector != null) {
+                $injector->handleInjections($element);
+            }
+            
-            if ($element->isAvailable($prefixRequest, $this->session, $this->response) == false) {
-                continue;
-            }
-
-
+
+
+
+
-            }
-$data = $element->process($prefixRequest, $this->session, $this->response);
+
-            $xmlSerializer->serialize($data, $xmlStreamWriter, array(stubXMLSerializer::OPT_ROOT_TAG => $name));
-            if ($element instanceof stubXMLPageElement) {