MediaWiki 1.15.0

[autoinstallsdev/mediawiki.git] / includes / parser / Preprocessor_DOM.php

diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index af591b67d2fceaa9f7ed408f325738b5fc0b09fe..2e1145459cbfd3e4e0275d3635a5d44ca52f0b67 100644 (file)
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -6,6 +6,8 @@
 class Preprocessor_DOM implements Preprocessor {
        var $parser, $memoryLimit;
 
+       const CACHE_VERSION = 1;
+
        function __construct( $parser ) {
                $this->parser = $parser;
                $mem = ini_get( 'memory_limit' );
@@ -63,8 +65,61 @@ class Preprocessor_DOM implements Preprocessor {
         */
        function preprocessToObj( $text, $flags = 0 ) {
                wfProfileIn( __METHOD__ );
-               wfProfileIn( __METHOD__.'-makexml' );
+               global $wgMemc, $wgPreprocessorCacheThreshold;
+               
+               $xml = false;
+               $cacheable = strlen( $text ) > $wgPreprocessorCacheThreshold;
+               if ( $cacheable ) {
+                       wfProfileIn( __METHOD__.'-cacheable' );
+
+                       $cacheKey = wfMemcKey( 'preprocess-xml', md5($text), $flags );
+                       $cacheValue = $wgMemc->get( $cacheKey );
+                       if ( $cacheValue ) {
+                               $version = substr( $cacheValue, 0, 8 );
+                               if ( intval( $version ) == self::CACHE_VERSION ) {
+                                       $xml = substr( $cacheValue, 8 );
+                                       // From the cache
+                                       wfDebugLog( "Preprocessor", "Loaded preprocessor XML from memcached (key $cacheKey)" );
+                               }
+                       }
+               }
+               if ( $xml === false ) {
+                       if ( $cacheable ) {
+                               wfProfileIn( __METHOD__.'-cache-miss' );
+                               $xml = $this->preprocessToXml( $text, $flags );
+                               $cacheValue = sprintf( "%08d", self::CACHE_VERSION ) . $xml;
+                               $wgMemc->set( $cacheKey, $cacheValue, 86400 );
+                               wfProfileOut( __METHOD__.'-cache-miss' );
+                               wfDebugLog( "Preprocessor", "Saved preprocessor XML to memcached (key $cacheKey)" );
+                       } else {
+                               $xml = $this->preprocessToXml( $text, $flags );
+                       }
 
+               }
+               wfProfileIn( __METHOD__.'-loadXML' );
+               $dom = new DOMDocument;
+               wfSuppressWarnings();
+               $result = $dom->loadXML( $xml );
+               wfRestoreWarnings();
+               if ( !$result ) {
+                       // Try running the XML through UtfNormal to get rid of invalid characters
+                       $xml = UtfNormal::cleanUp( $xml );
+                       $result = $dom->loadXML( $xml );
+                       if ( !$result ) {
+                               throw new MWException( __METHOD__.' generated invalid XML' );
+                       }
+               }
+               $obj = new PPNode_DOM( $dom->documentElement );
+               wfProfileOut( __METHOD__.'-loadXML' );
+               if ( $cacheable ) {
+                       wfProfileOut( __METHOD__.'-cacheable' );
+               }
+               wfProfileOut( __METHOD__ );
+               return $obj;
+       }
+       
+       function preprocessToXml( $text, $flags = 0 ) {
+               wfProfileIn( __METHOD__ );
                $rules = array(
                        '{' => array(
                                'end' => '}',
@@ -304,7 +359,9 @@ class Preprocessor_DOM implements Preprocessor {
                                } else {
                                        $attrEnd = $tagEndPos;
                                        // Find closing tag
-                                       if ( preg_match( "/<\/$name\s*>/i", $text, $matches, PREG_OFFSET_CAPTURE, $tagEndPos + 1 ) ) {
+                                       if ( preg_match( "/<\/" . preg_quote( $name, '/' ) . "\s*>/i", 
+                                                       $text, $matches, PREG_OFFSET_CAPTURE, $tagEndPos + 1 ) ) 
+                                       {
                                                $inner = substr( $text, $tagEndPos + 1, $matches[0][1] - $tagEndPos - 1 );
                                                $i = $matches[0][1] + strlen( $matches[0][0] );
                                                $close = '<close>' . htmlspecialchars( $matches[0][0] ) . '</close>';
@@ -569,24 +626,9 @@ class Preprocessor_DOM implements Preprocessor {
                $stack->rootAccum .= '</root>';
                $xml = $stack->rootAccum;
 
-               wfProfileOut( __METHOD__.'-makexml' );
-               wfProfileIn( __METHOD__.'-loadXML' );
-               $dom = new DOMDocument;
-               wfSuppressWarnings();
-               $result = $dom->loadXML( $xml );
-               wfRestoreWarnings();
-               if ( !$result ) {
-                       // Try running the XML through UtfNormal to get rid of invalid characters
-                       $xml = UtfNormal::cleanUp( $xml );
-                       $result = $dom->loadXML( $xml );
-                       if ( !$result ) {
-                               throw new MWException( __METHOD__.' generated invalid XML' );
-                       }
-               }
-               $obj = new PPNode_DOM( $dom->documentElement );
-               wfProfileOut( __METHOD__.'-loadXML' );
                wfProfileOut( __METHOD__ );
-               return $obj;
+               
+               return $xml;
        }
 }
 
@@ -831,7 +873,6 @@ class PPFrame_DOM implements PPFrame {
                if ( is_string( $root ) ) {
                        return $root;
                }
-               wfProfileIn( __METHOD__ );
 
                if ( ++$this->parser->mPPNodeCount > $this->parser->mOptions->mMaxPPNodeCount )
                {
@@ -841,6 +882,7 @@ class PPFrame_DOM implements PPFrame {
                if ( $expansionDepth > $this->parser->mOptions->mMaxPPExpandDepth ) {
                        return '<span class="error">Expansion depth limit exceeded</span>';
                }
+               wfProfileIn( __METHOD__ );
                ++$expansionDepth;
 
                if ( $root instanceof PPNode_DOM ) {