}
DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 1, $good, $total ) );
- DeferredUpdates::addUpdate( new SearchUpdate( $id, $title, $content->getTextForSearchIndex() ) );
- // @todo let the search engine decide what to do with the content object
+ DeferredUpdates::addUpdate( new SearchUpdate( $id, $title, $content ) );
// If this is another user's talk page, update newtalk.
// Don't do this if $options['changed'] = false (null-edits) nor if
if ( !isset( $this->mText ) ) {
if ( $this->mRevision != null ) {
//TODO: if we could plug in some code that knows about special content models *and* about
- // special features of the search engine, the search could benefit.
+ // special features of the search engine, the search could benefit. See similar
+ // comment in SearchUpdate's constructor
$content = $this->mRevision->getContent();
$this->mText = $content ? $content->getTextForSearchIndex() : '';
} else { // TODO: can we fetch raw wikitext for commons images?
private $mId = 0, $mNamespace, $mTitle, $mText;
private $mTitleWords;
- public function __construct( $id, $title, $text = false ) {
+ /**
+ * Constructor
+ *
+ * @param int $id Page id to update
+ * @param Title|string $title Title of page to update
+ * @param Content|string|false $content Content of the page to update.
+ * If a Content object, text will be gotten from it. String is for back-compat.
+ * Passing false tells the backend to just update the title, not the content
+ */
+ public function __construct( $id, $title, $content = false ) {
if ( is_string( $title ) ) {
$nt = Title::newFromText( $title );
} else {
if ( $nt ) {
$this->mId = $id;
- $this->mText = $text;
+ // @todo This isn't ideal, we'd really like to have content-specific
+ // handling here. See similar content in SearchEngine::initText().
+ if( is_string( $content ) ) {
+ // b/c for ApprovedRevs
+ $this->mText = $content;
+ } else {
+ $this->mText = $content ? $content->getTextForSearchIndex() : false;
+ }
$this->mNamespace = $nt->getNamespace();
$this->mTitle = $nt->getText(); # Discard namespace
$title = $titleObj->getPrefixedDBkey();
$this->output( "$title..." );
# Update searchindex
- # TODO: pass the Content object to SearchUpdate, let the search engine decide how to deal with it.
- $u = new SearchUpdate( $pageId, $titleObj->getText(), $rev->getContent()->getTextForSearchIndex() );
+ $u = new SearchUpdate( $pageId, $titleObj->getText(), $rev->getContent() );
$u->doUpdate();
$this->output( "\n" );
}
$rev = new Revision( $s );
$content = $rev->getContent();
- $text = $content->getTextForSearchIndex();
- $u = new SearchUpdate( $s->page_id, $title, $text );
+ $u = new SearchUpdate( $s->page_id, $title, $content );
$u->doUpdate();
} catch ( MWContentSerializationException $ex ) {
$this->output( "Failed to deserialize content of revision {$s->rev_id} of page "