Changeset 206

Timestamp:

02/03/07 01:10:51 (1 year ago)

Author:

mikey

Message:

added error handling to replace default error message output by php
still needs some tweaking for the xsl-template of changing the error message into a div container

Files:

• trunk/experiments/general/xsl/main_home.xml (modified) (1 diff)
• trunk/experiments/general/xsl/parts.xml (modified) (1 diff)
• trunk/experiments/general/xsl/parts2.xml (modified) (1 diff)
• trunk/experiments/general/xsl/stub.xsl (modified) (3 diffs)
• trunk/src/main/php/net/stubbles/xml/stubXMLXIncludeStreamWrapper.php (modified) (3 diffs)

trunk/experiments/general/xsl/main_home.xml

@@ -7 +7 @@
-    <stub:link page="testlinkPage">Das ist ein Stubbles-Link</stub:link>
-    <stub:include href="parts.xml" part="frank"/>
+    <stub:include href="parts.xml" part="schst"/>
-    <stub:comment>Das ist ein Kommentar</stub:comment>
-    <stub:script>

trunk/experiments/general/xsl/parts.xml

@@ -9 +9 @@
-    Nico Steiner
-  </part>
+  <part name="schst">
+    Stephan Schmidt
+  </part>
-</parts>

trunk/experiments/general/xsl/parts2.xml

@@ -2 +2 @@
-<parts
-    xmlns:stub="http://stubbles.org/stub"
- 
-
-   
-
-
-
-
-   
-Nico Steiner
-
-
+  
+  
+    
+  
+  
+  
+  
+    
+  <stub:include href="parts.xml" part="nico"/>
+  
+  
-</parts>

trunk/experiments/general/xsl/stub.xsl

@@ -16 +16 @@
-  <xsl:template match="stub:script">
-    <script type="text/javascript"><xsl:copy-of select="@*"/>      
-   
+  
-    </script>
+  </xsl:template>
+  
+  <xsl:template match="stub:error">
+    <div class="stubTransformError">
+      <xsl:copy-of select="node()"/>
+    </div>
-  </xsl:template>
-  
@@ -86 +92 @@
-    <xsl:param name="href" select="@href"/>
-    <xsl:param name="part" select="@part"/>    
-
+?part={$part}
-      <xi:fallback>
-        ERROR: Could not include part <xsl:value-of select="$part"/> in file <xsl:value-of select="$href"/>
@@ -117 +123 @@
-      <xsl:otherwise>
-        <small>
-   
- 
-   
+  
+  
+    
-        </small>
-      </xsl:otherwise>

trunk/src/main/php/net/stubbles/xml/stubXMLXIncludeStreamWrapper.php

@@ -47 +47 @@
-    protected $cachedFileName;
-    /**
-x pointer to retrieve only a part of the file
-
-
-
-xPointer
+the part that will be included
+
+
+
+part
-    /**
-     * current file pointer
@@ -127 +127 @@
-    protected function processFile()
-    {
+        $previousErrorHandling = libxml_use_internal_errors(true);
-        $xslProcessor = clone self::$xslProcessor;
-        $xslProcessor->setXMLDocument(DOMDocument::load($this->fileName));
-        $resultDoc = $xslProcessor->transformToDoc();
+        // we save first to prevent a infinite loop in  case of recursions
+        $resultDoc->save($this->cachedFileName);
-        $resultDoc->xinclude();
+        $errors = libxml_get_errors();
+        if (count($errors) > 0) {
+            unlink($this->cachedFileName);
+            libxml_clear_errors();
+            foreach ($errors as $error) {
+               switch ($error->level) {
+                   case LIBXML_ERR_WARNING:
+                       $element = $resultDoc->createElement('stub:error', 'Warning: ' . trim($error->message) . (($error->file) ? (' in file ' . $error->file) : ('')) . ' on line ' . $error->line . ' in column ' . $error->column);
+                       $element->setAttribute('stub:errorType', 'warning');
+                       if (null != $this->part && strlen($this->part) > 0) {
+                           $xpath = new DOMXPath($resultDoc);
+                           $entry = $xpath->query("/parts/part[@name='" . $this->part ."']/node()")->item(0);
+                           $entry->appendChild($element);
+                       } else {
+                           $resultDoc->documentElement->appendChild($element);
+                       }
+                       break;
+                   case LIBXML_ERR_ERROR:
+                       $element = $resultDoc->createElement('stub:error', 'Error: ' . trim($error->message) . (($error->file) ? (' in file ' . $error->file) : ('')) . ' on line ' . $error->line . ' in column ' . $error->column);
+                       $element->setAttribute('stub:errorType', 'error');
+                       if (null != $this->part && strlen($this->part) > 0) {
+                           $xpath = new DOMXPath($resultDoc);
+                           $entry = $xpath->query("/parts/part[@name='" . $this->part ."']")->item(0);
+                           $entry->appendChild($element);
+                       } else {
+                           $resultDoc->documentElement->appendChild($element);
+                       }
+                       break;
+                   case LIBXML_ERR_FATAL:
+                       throw new stubXMLException('Fatal error: ' . trim($error->message) . (($error->file) ? (' in file ' . $error->file) : ('')) . ' on line ' . $error->line . ' in column ' . $error->column);
+               }
+            }
+        }
+        
-        $resultDoc->save($this->cachedFileName);
+        libxml_use_internal_errors($previousErrorHandling);
-    }
-
@@ -191 +229 @@
-    protected function parsePath($path)
-    {
-xPointer) = sscanf($path, 'xinc://%[^#]#xpointer(%[^)
-    
-    
-xPointer            = $xPointer
+part) = sscanf($path, 'xinc://%[^?]?part=%[^$
+
+
+part            = $part
-    }
-}