Fix bug 2642 : watchdetails message using HTML instead of wiki syntax. Patch by zigge...

[lhc/web/wiklou.git] / includes / SearchUpdate.php

diff --git a/includes/SearchUpdate.php b/includes/SearchUpdate.php
index fd0a10a..dc383fe 100644 (file)
--- a/includes/SearchUpdate.php
+++ b/includes/SearchUpdate.php
@@ -1,14 +1,19 @@
 <?php
-# $Id$
-# See deferred.doc
-
+/**
+ * See deferred.txt
+ * @package MediaWiki
+ */
+
+/**
+ *
+ * @package MediaWiki
+ */
 class SearchUpdate {
 
        /* private */ var $mId = 0, $mNamespace, $mTitle, $mText;
        /* private */ var $mTitleWords;
 
-       function SearchUpdate( $id, $title, $text = false )
-       {
+       function SearchUpdate( $id, $title, $text = false ) {
                $nt = Title::newFromText( $title );
                if( $nt ) {
                        $this->mId = $id;
@@ -23,33 +28,32 @@ class SearchUpdate {
                }
        }
 
-       function doUpdate()
-       {
-               global $wgDBminWordLen, $wgLang, $wgDisableSearchUpdate;
+       function doUpdate() {
+               global $wgDBminWordLen, $wgContLang, $wgDisableSearchUpdate;
 
                if( $wgDisableSearchUpdate || !$this->mId ) {
                        return false;
                }
+               $fname = 'SearchUpdate::doUpdate';
+               wfProfileIn( $fname );
+
                require_once( 'SearchEngine.php' );
-               $lc = SearchEngine::legalSearchChars() . "&#;";
-               $db =& wfGetDB( DB_MASTER );
-               $searchindex = $db->tableName( 'searchindex' );
+               $search =& SearchEngine::create();
+               $lc = $search->legalSearchChars() . '&#;';
                
-               if( $this->mText == false ) {
-                       # Just update the title
-                       $lowpri = $db->lowPriorityOption();
-                       $sql = "UPDATE $lowpri $searchindex SET si_title='" .
-                         $db->strencode( Title::indexTitle( $this->mNamespace, $this->mTitle ) ) .
-                         "' WHERE si_page={$this->mId}";
-                       $db->query( $sql, "SearchUpdate::doUpdate" );
+               if( $this->mText === false ) {
+                       $search->updateTitle($this->mId,
+                               Title::indexTitle( $this->mNamespace, $this->mTitle ));
+                       wfProfileOut( $fname );
                        return;
                }
 
                # Language-specific strip/conversion
-               $text = $wgLang->stripForSearch( $this->mText );
+               $text = $wgContLang->stripForSearch( $this->mText );
 
+               wfProfileIn( $fname.'-regexps' );
                $text = preg_replace( "/<\\/?\\s*[A-Za-z][A-Za-z0-9]*\\s*([^>]*?)>/",
-                 " ", strtolower( " " . $text /*$this->mText*/ . " " ) ); # Strip HTML markup
+                 ' ', strtolower( " " . $text /*$this->mText*/ . " " ) ); # Strip HTML markup
                $text = preg_replace( "/(^|\\n)\\s*==\\s+([^\\n]+)\\s+==\\s/sD",
                  "\\2 \\2 \\2 ", $text ); # Emphasize headings
 
@@ -75,17 +79,38 @@ class SearchUpdate {
                $text = preg_replace( "/[^{$lc}]+/", " ", $text );
 
                # Handle 's, s'
-               $text = preg_replace( "/([{$lc}]+)'s /", "\\1 \\1's ", $text );
-               $text = preg_replace( "/([{$lc}]+)s' /", "\\1s ", $text );
+               #
+               #   $text = preg_replace( "/([{$lc}]+)'s /", "\\1 \\1's ", $text );
+               #   $text = preg_replace( "/([{$lc}]+)s' /", "\\1s ", $text );
+               #
+               # These tail-anchored regexps are insanely slow. The worst case comes
+               # when Japanese or Chinese text (ie, no word spacing) is written on
+               # a wiki configured for Western UTF-8 mode. The Unicode characters are
+               # expanded to hex codes and the "words" are very long paragraph-length
+               # monstrosities. On a large page the above regexps may take over 20
+               # seconds *each* on a 1GHz-level processor.
+               #
+               # Following are reversed versions which are consistently fast
+               # (about 3 milliseconds on 1GHz-level processor).
+               #
+               $text = strrev( preg_replace( "/ s'([{$lc}]+)/", " s'\\1 \\1", strrev( $text ) ) );
+               $text = strrev( preg_replace( "/ 's([{$lc}]+)/", " s\\1", strrev( $text ) ) );
 
                # Strip wiki '' and '''
                $text = preg_replace( "/''[']*/", " ", $text );
-               
-               $sql = "REPLACE  INTO $searchindex (si_page,si_title,si_text) VALUES ({$this->mId},'" .
-                 $db->strencode( Title::indexTitle( $this->mNamespace, $this->mTitle ) ) . "','" .
-                 $db->strencode( $text ) . "')";
-               $db->query( $sql, "SearchUpdate::doUpdate" );
+               wfProfileOut( "$fname-regexps" );
+               $search->update($this->mId, Title::indexTitle( $this->mNamespace, $this->mTitle ),
+                               $text);
+               wfProfileOut( $fname );
        }
 }
 
+/**
+ * Placeholder class
+ * @package MediaWiki
+ */
+class SearchUpdateMyISAM extends SearchUpdate {
+       # Inherits everything
+}
+
 ?>