var $mCache, $mUseCache, $mDisable, $mExpiry;
var $mMemcKey, $mKeys, $mParserOptions, $mParser;
var $mExtensionMessages;
-
var $mInitialised = false;
- function initialise( &$memCached, $useDB, $expiry, $memcPrefix ) {
+ function initialise( &$memCached, $useDB, $expiry, $memcPrefix) {
$fname = 'MessageCache::initialise';
wfProfileIn( $fname );
+
$this->mUseCache = !is_null( $memCached );
$this->mMemc = &$memCached;
$this->mDisable = !$useDB;
$this->mMemcKey = $memcPrefix.':messages';
$this->mKeys = false; # initialised on demand
$this->mInitialised = true;
+
wfProfileIn( $fname.'-parseropt' );
$this->mParserOptions = ParserOptions::newFromUser( $u=NULL );
wfProfileOut( $fname.'-parseropt' );
wfProfileIn( $fname.'-parser' );
$this->mParser = new Parser;
wfProfileOut( $fname.'-parser' );
-
+
$this->load();
wfProfileOut( $fname );
}
*/
function load() {
global $wgAllMessagesEn;
-
+
if ( $this->mDisable ) {
wfDebug( "MessageCache::load(): disabled\n" );
return true;
$fname = 'MessageCache::load';
wfProfileIn( $fname );
$success = true;
-
+
if ( $this->mUseCache ) {
wfProfileIn( $fname.'-fromcache' );
$this->mCache = $this->mMemc->get( $this->mMemcKey );
wfProfileOut( $fname.'-fromcache' );
-
+
# If there's nothing in memcached, load all the messages from the database
if ( !$this->mCache ) {
wfDebug( "MessageCache::load(): loading all messages\n" );
$this->lock();
# Other threads don't need to load the messages if another thread is doing it.
- $success = $this->mMemc->set( $this->mMemcKey, "loading", MSG_LOAD_TIMEOUT );
+ $success = $this->mMemc->add( $this->mMemcKey, "loading", MSG_LOAD_TIMEOUT );
if ( $success ) {
wfProfileIn( $fname.'-load' );
$this->loadFromDB();
}
$this->unlock();
}
-
+
if ( !is_array( $this->mCache ) ) {
wfMsg( "MessageCache::load(): individual message mode\n" );
# If it is 'loading' or 'error', switch to individual message mode, otherwise disable
- # Causing too much DB load, disabling -- TS
+ # Causing too much DB load, disabling -- TS
$this->mDisable = true;
/*
if ( $this->mCache == "loading" ) {
}
/**
- * Loads all cacheable messages from the database
+ * Loads all or main part of cacheable messages from the database
*/
function loadFromDB() {
- $fname = 'MessageCache::loadFromDB';
+ global $wgPartialMessageCache;
+ $fname = 'MessageCache::loadFromDB';
$dbr =& wfGetDB( DB_SLAVE );
- $res = $dbr->select( 'cur',
- array( 'cur_title', 'cur_text' ),
- array( 'cur_is_redirect' => 0, 'cur_namespace' => NS_MEDIAWIKI ),
- $fname
- );
-
+ $conditions = array( 'cur_is_redirect' => 0,
+ 'cur_namespace' => NS_MEDIAWIKI);
+ if ($wgPartialMessageCache) {
+ if (is_array($wgPartialMessageCache)) {
+ $conditions['cur_title']=$wgPartialMessageCache;
+ } else {
+ require_once("MessageCacheHints.php");
+ $conditions['cur_title']=MessageCacheHints::get();
+ }
+ }
+ $res = $dbr->select( 'cur',
+ array( 'cur_title', 'cur_text' ), $conditions, $fname);
+
$this->mCache = array();
for ( $row = $dbr->fetchObject( $res ); $row; $row = $dbr->fetchObject( $res ) ) {
$this->mCache[$row->cur_title] = $row->cur_text;
$dbr->freeResult( $res );
}
-
+
/**
* Not really needed anymore
*/
function getKeys() {
- global $wgAllMessagesEn, $wgLang;
+ global $wgAllMessagesEn, $wgContLang;
if ( !$this->mKeys ) {
$this->mKeys = array();
foreach ( $wgAllMessagesEn as $key => $value ) {
- array_push( $this->mKeys, $wgLang->ucfirst( $key ) );
+ array_push( $this->mKeys, $wgContLang->ucfirst( $key ) );
}
}
return $this->mKeys;
}
-
+
/**
* Obsolete
*/
return true;
/*
global $wgAllMessagesEn, $wgLang;
- return array_key_exists( $wgLang->lcfirst( $key ), $wgAllMessagesEn ) ||
+ return array_key_exists( $wgLang->lcfirst( $key ), $wgAllMessagesEn ) ||
array_key_exists( $key, $wgAllMessagesEn );
*/
}
for ($i=0; $i < MSG_WAIT_TIMEOUT && !$this->mMemc->add( $lockKey, 1, MSG_LOCK_TIMEOUT ); $i++ ) {
sleep(1);
}
-
+
return $i >= MSG_WAIT_TIMEOUT;
}
-
+
function unlock() {
if ( !$this->mUseCache ) {
return;
$lockKey = $this->mMemcKey . 'lock';
$this->mMemc->delete( $lockKey );
}
-
- function get( $key, $useDB ) {
- global $wgLang, $wgLanguageCode;
-
+
+ function get( $key, $useDB, $forcontent=true ) {
+ global $wgContLanguageCode;
+ if( $forcontent ) {
+ global $wgContLang;
+ $lang =& $wgContLang;
+ $langcode = $wgContLanguageCode;
+ } else {
+ global $wgLang, $wgLanguageCode;
+ $lang =& $wgLang;
+ $langcode = $wgLanguageCode;
+ }
# If uninitialised, someone is trying to call this halfway through Setup.php
- if ( !$this->mInitialised ) {
+ if( !$this->mInitialised ) {
return "<$key>";
}
-
+
$message = false;
- if ( !$this->mDisable && $useDB ) {
- $title = $wgLang->ucfirst( $key );
-
+ if( !$this->mDisable && $useDB ) {
+ $title = $lang->ucfirst( $key );
+ if( $langcode != $wgContLanguageCode ) {
+ $title .= '/' . $langcode;
+ }
# Try the cache
- if ( $this->mUseCache && $this->mCache && array_key_exists( $title, $this->mCache ) ) {
+ if( $this->mUseCache && $this->mCache && array_key_exists( $title, $this->mCache ) ) {
$message = $this->mCache[$title];
}
-
+
+ if ( !$message && $this->mUseCache ) {
+ $message = $this->mMemc->get( $this->mMemcKey . ':' . $title );
+ if( $message ) {
+ $this->mCache[$title] = $message;
+ }
+ }
+
# If it wasn't in the cache, load each message from the DB individually
if ( !$message ) {
$dbr =& wfGetDB( DB_SLAVE );
- $result = $dbr->getArray( 'cur', array('cur_text'),
+ $result = $dbr->selectRow( 'cur', array('cur_text'),
array( 'cur_namespace' => NS_MEDIAWIKI, 'cur_title' => $title ),
'MessageCache::get' );
if ( $result ) {
$message = $result->cur_text;
+ if( $this->mUseCache ) {
+ $this->mCache[$title] = $message;
+ /* individual messages may be often
+ recached until proper purge code exists
+ */
+ $this->mMemc->set( $this->mMemcKey . ':' . $title, $message, 300 );
+ }
}
}
}
# Try the extension array
- if ( !$message ) {
+ if( !$message ) {
$message = @$this->mExtensionMessages[$key];
}
- # Try the array in $wgLang
- if ( !$message ) {
- $message = $wgLang->getMessage( $key );
- }
+ # Try the array in the language object
+ if( !$message ) {
+ wfSuppressWarnings();
+ $message = $lang->getMessage( $key );
+ wfRestoreWarnings();
+ }
# Try the English array
- if ( !$message && $wgLanguageCode != 'en' ) {
+ if( !$message && $langcode != 'en' ) {
+ wfSuppressWarnings();
$message = Language::getMessage( $key );
+ wfRestoreWarnings();
}
-
+
# Final fallback
- if ( !$message ) {
+ if( !$message ) {
$message = "<$key>";
}
-
+
# Replace brace tags
$message = $this->transform( $message );
return $message;
}
function transform( $message ) {
- if( !$this->mDisableTransform ) {
- if ( strstr( $message, '{{' ) !== false ) {
+ if( !$this->mDisableTransform ) {
+ if( strpos( $message, '{{' ) !== false ) {
$message = $this->mParser->transformMsg( $message, $this->mParserOptions );
}
}
return $message;
}
-
+
function disable() { $this->mDisable = true; }
function enable() { $this->mDisable = false; }
function disableTransform() { $this->mDisableTransform = true; }
+ function enableTransform() { $this->mDisableTransform = false; }
function addMessage( $key, $value ) {
$this->mExtensionMessages[$key] = $value;
$this->mExtensionMessages[$key] = $value;
}
}
-
+
/**
* Clear all stored messages. Mainly used after a mass rebuild.
*/
dépôts / lhc / web / wiklou.git / blobdiff