Merged in my changes from REL1_4

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index fbb1f0e..143666a 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -46,7 +46,7 @@ define('MAG_NAMESPACE', 32);
 define('MAG_TOC', 33);
 define('MAG_GRAMMAR', 34);
 define('MAG_NOTITLECONVERT', 35);
-
+define('MAG_NOCONTENTCONVERT', 36);
 define('MAG_CURRENTWEEK', 37);
 define('MAG_CURRENTDOW', 38);
 

diff --git a/languages/Language.php b/languages/Language.php
index a63f757..d4f1886 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -237,6 +237,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
        MAG_SERVER               => array( 0,    'SERVER'                 ),
        MAG_GRAMMAR              => array( 0,    'GRAMMAR:'               ),
        MAG_NOTITLECONVERT       => array( 0,    '__NOTITLECONVERT__', '__NOTC__'),
+       MAG_NOCONTENTCONVERT     => array( 0,    '__NOCONTENTCONVERT__', '__NOCC__'),
        MAG_CURRENTWEEK          => array( 1,    'CURRENTWEEK'            ),
        MAG_CURRENTDOW           => array( 1,    'CURRENTDOW'             ),
 );

diff --git a/languages/LanguageZh.php b/languages/LanguageZh.php
index cbccd14..9b65a82 100644 (file)
--- a/languages/LanguageZh.php
+++ b/languages/LanguageZh.php
@@ -16,13 +16,15 @@ function zhOnArticleSaveComplete($article, $user, $text, $summary, $isminor, $is
                        return true;
 
                $title = $titleobj->getDBkey();
-               $t = explode('/', $title, 2);
-               if( $t[0] == 'Zhconversiontable' ) {
-                       if(!in_array($t[1], array('zh-cn', 'zh-tw', 'zh-sg', 'zh-hk')))
-                               return true;
-                       $wgContLang->reloadTables();                    
+               $t = explode('/', $title, 3);
+               $c = count($t);
+               if( $c > 1 && $t[0] == 'Zhconversiontable' ) {
+                       if(in_array($t[1], array('zh-cn', 'zh-tw', 'zh-sg', 'zh-hk'))) {
+                               $wgContLang->reloadTables();
+                       }
                }
        }
+       return true;
 }
 
 $wgHooks['ArticleSaveComplete'][] = 'zhOnArticleSaveComplete';
@@ -37,79 +39,168 @@ class LanguageZh extends LanguageZh_cn {
        var $mTables=false; //the mapping tables
        var $mTablesLoaded = false;
        var $mCacheKey;
-       var $mDoTitleConvert = true;
+       var $mDoTitleConvert = true, $mDoContentConvert = true;
+
        function LanguageZh() {
                global $wgDBname;
                $this->mCacheKey = $wgDBname . ":zhtables";
        }
 
-       function reloadTables() {
+       // a write lock
+       function lockCache() {
+               global $wgMemc;
+               $success = false;
+               for($i=0; $i<30; $i++) {
+                       if($success = $wgMemc->add($this->mCacheKey . "lock", 1, 10))
+                               break;
+                       sleep(1);
+               }
+               return $success;                
+       }
+
+       function unlockCache() {
+               global $wgMemc;
+               $wgMemc->delete($this->mCacheKey . "lock");
+       }
+
+       function updateTable($code, $table) {
                global $wgMemc;
-               $wgMemc->delete($this->mCacheKey);
-               $this->mTablesLoaded=false;
-               $this->loadTables();
+               if(!$this->mTablesLoaded)
+                       $this->loadTables();
+
+               $this->mTables[$code] = array_merge($this->mTables[$code], $table);
+               if($this->lockCache()) {
+                       $wgMemc->delete($this->mCacheKey);
+                       $wgMemc->set($this->mCacheKey, $this->mTables, 43200);
+                       $this->unlockCache();
+               }
+       }
+
+       function reloadTables() {
+               if($this->mTables)
+                       unset($this->mTables);
+               $this->mTablesLoaded = false;
+               $this->loadTables(false);
        }
 
        // load conversion tables either from the cache or the disk
-       function loadTables() {
+       function loadTables($fromcache=true) {
                global $wgMemc;
                if( $this->mTablesLoaded )
                        return;
                $this->mTablesLoaded = true;
-               $this->mTables = $wgMemc->get( $this->mCacheKey );
-               if( empty( $this->mTables ) ) {
-                       global $wgMessageCache;
-                       require( "includes/ZhConversion.php" );
-                       $this->mTables = array();
-                       $this->mTables['zh-cn'] = $zh2CN;
-                       $this->mTables['zh-tw'] = $zh2TW;
-                       $this->mTables['zh-sg'] = $zh2SG;
-                       $this->mTables['zh-hk'] = $zh2HK;
-                       if( is_object( $wgMessageCache ) ){
-                               $cached = $this->parseCachedTable( $wgMessageCache->get( 'zhconversiontable/zh-cn', true, true, true ) );
-                               $this->mTables['zh-cn'] = array_merge($this->mTables['zh-cn'], $cached);
-
-                               $cached = $this->parseCachedTable( $wgMessageCache->get( 'zhconversiontable/zh-tw', true, true, true ) );
-                               $this->mTables['zh-tw'] = array_merge($this->mTables['zh-tw'], $cached);
-
-                               $cached = $this->parseCachedTable( $wgMessageCache->get( 'zhconversiontable/zh-sg', true, true, true ) );
-                               $this->mTables['zh-sg'] = array_merge($this->mTables['zh-sg'], $cached);
-
-                               $cached = $this->parseCachedTable( $wgMessageCache->get( 'zhconversiontable/zh-hk', true, true, true ) );
-                               $this->mTables['zh-hk'] = array_merge($this->mTables['zh-hk'], $cached);
-
-                       }
+               if($fromcache) {
+                       $this->mTables = $wgMemc->get( $this->mCacheKey );
+                       if( !empty( $this->mTables ) ) //all done
+                               return;
+               }
+               // not in cache, or we need a fresh reload. 
+               // we will first load the tables from file
+               // then update them using things in MediaWiki:Zhconversiontable/*
+               global $wgMessageCache;
+               require( "includes/ZhConversion.php" );
+               $this->mTables = array();
+               $this->mTables['zh-cn'] = $zh2CN;
+               $this->mTables['zh-tw'] = $zh2TW;
+               $this->mTables['zh-sg'] = array_merge($zh2CN, $zh2SG);
+               $this->mTables['zh-hk'] = array_merge($zh2TW, $zh2HK);
+
+               $cached = $this->parseCachedTable('zh-cn');
+               $this->mTables['zh-cn'] = array_merge($this->mTables['zh-cn'], $cached);
+
+               $cached = $this->parseCachedTable('zh-tw');
+               $this->mTables['zh-tw'] = array_merge($this->mTables['zh-tw'], $cached);
+
+               $cached = $this->parseCachedTable('zh-sg');
+               $this->mTables['zh-sg'] = array_merge($this->mTables['zh-sg'], $cached);
+
+               $cached = $this->parseCachedTable('zh-hk');
+               $this->mTables['zh-hk'] = array_merge($this->mTables['zh-hk'], $cached);
+               if($this->lockCache()) {
                        $wgMemc->set($this->mCacheKey, $this->mTables, 43200);
+                       $this->unlockCache();
                }
        }
        
+
        /*
                parse the conversion table stored in the cache 
 
-               the table should be in the following format:
+               the tables should be in blocks of the following form:
 
                        -{
                                word => word ;
                                word => word ;
                                ...
-                       -}
+                       }-
+               
+               to make the tables more manageable, subpages are allowed
+               and will be parsed recursively if $recursive=true
+
        */
-       function parseCachedTable($txt) {
-               /* $txt should be enclosed by -{ and }- */
-               $a = explode( '-{', $txt);
-               if( count($a) < 2)
+       function parseCachedTable($code, $subpage='', $recursive=true) {
+               global $wgMessageCache;
+               static $parsed = array();
+
+               if(!is_object($wgMessageCache))
                        return array();
-               array_shift($a);
-               $b = explode( '}-', $a[0]);
 
-               $stripped = str_replace(array('*','#'), '', $b[0]);
-               $table = explode( ';', $stripped );
-               $ret = array();
-               foreach( $table as $t ) {
-                       $m = explode( '=>', $t );
-                       if( count( $m ) != 2)
+               $key = 'zhconversiontable/'.$code;
+               if($subpage)
+                       $key .= '/' . $subpage;
+
+               if(array_key_exists($key, $parsed))
+                       return array();
+       
+
+               $txt = $wgMessageCache->get( $key, true, true, true );
+
+               // get all subpage links of the form
+               // [[MediaWiki:Zhconversiontable/zh-xx/...|...]]
+               $linkhead = $this->getNsText(NS_MEDIAWIKI) . ':Zhconversiontable';
+               $subs = explode('[[', $txt);
+               $sublinks = array();
+               foreach( $subs as $sub ) {
+                       $link = explode(']]', $sub, 2);
+                       if(count($link) != 2)
                                continue;
-                       $ret[trim($m[0])] = trim($m[1]);
+                       $b = explode('|', $link[0]);
+                       $b = explode('/', trim($b[0]), 3);
+                       if(count($b)==3)
+                               $sublink = $b[2];
+                       else    
+                               $sublink = '';
+
+                       if($b[0] == $linkhead && $b[1] == $code) {
+                               $sublinks[] = $sublink;
+                       }
+               }
+
+
+               // parse the mappings in this page
+               $blocks = explode('-{', $txt);
+               array_shift($blocks);
+               $ret = array(); 
+               foreach($blocks as $block) {
+                       $mappings = explode('}-', $block, 2);
+                       $stripped = str_replace(array("'", '"', '*','#'), '', $mappings[0]);
+                       $table = explode( ';', $stripped );
+                       foreach( $table as $t ) {
+                               $m = explode( '=>', $t );
+                               if( count( $m ) != 2)
+                                       continue;
+                               $ret[trim($m[0])] = trim($m[1]);
+                       }
+               }
+               $parsed[$key] = true;
+
+
+               // recursively parse the subpages
+               if($recursive) {
+                       foreach($sublinks as $link) {
+                               $s = $this->parseCachedTable($code, $link, $recursive);
+                               $ret = array_merge($ret, $s);
+                       }
                }
                return $ret;
        }
@@ -138,10 +229,12 @@ class LanguageZh extends LanguageZh_cn {
                if( !$this->mZhLanguageCode ) {
                        // see if some zh- variant is set in the http header,
                        $this->mZhLanguageCode="zh";
-                       $header = str_replace( '_', '-', strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]));
-                       $zh = strstr($header, 'zh-');
-                       if($zh) {
-                               $this->mZhLanguageCode = substr($zh,0,5);
+                       if(array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
+                               $header = str_replace( '_', '-', strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]));
+                               $zh = strstr($header, 'zh-');
+                               if($zh) {
+                                       $this->mZhLanguageCode = substr($zh,0,5);
+                               }
                        }
                }
                return $this->mZhLanguageCode;
@@ -173,8 +266,8 @@ class LanguageZh extends LanguageZh_cn {
                switch( $toVariant ) {
                        case 'zh-cn': $ret = strtr($text, $this->mTables['zh-cn']);break;
                        case 'zh-tw': $ret = strtr($text, $this->mTables['zh-tw']);break;
-                       case 'zh-sg': $ret = strtr(strtr($text, $this->mTables['zh-cn']), $this->mTables['zh-sg']);break;
-                       case 'zh-hk': $ret = strtr(strtr($text, $this->mTables['zh-tw']), $this->mTables['zh-hk']);break;
+                       case 'zh-sg': $ret = strtr($text, $this->mTables['zh-sg']);break;
+                       case 'zh-hk': $ret = strtr($text, $this->mTables['zh-hk']);break;
                        default: $ret = $text;
                }
                wfProfileOut( $fname );
@@ -213,6 +306,11 @@ class LanguageZh extends LanguageZh_cn {
                if( $mw->matchAndRemove( $text ) )
                        $this->mDoTitleConvert = false;
 
+               $mw =& MagicWord::get( MAG_NOCONTENTCONVERT );
+               if( $mw->matchAndRemove( $text ) ) {
+                       $this->mDoContentConvert = false;
+               }
+
                // no conversion if redirecting
                $mw =& MagicWord::get( MAG_REDIRECT );
                if( $mw->matchStart( $text ))
@@ -233,6 +331,9 @@ class LanguageZh extends LanguageZh_cn {
                        }
                }
 
+               if( !$this->mDoContentConvert )
+                       return $text;
+
                $plang = $this->getPreferredVariant();
                $fallback = $this->getVariantFallback($plang);
 
@@ -353,5 +454,6 @@ class LanguageZh extends LanguageZh_cn {
                $variant = $this->getPreferredVariant();
                return '!' . $variant ;
        }
+
 }
 ?>