https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114130
Revision: 114130
Author: maxsem
Date: 2012-03-19 12:24:12 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
Follow-up r114129: rename file
Modified Paths:
--------------
trunk/extensions/MobileFrontend/MobileFrontend.php
Added Paths:
-----------
trunk/extensions/MobileFrontend/api/ApiQueryExtracts.php
Removed Paths:
-------------
trunk/extensions/MobileFrontend/api/ApiQueryExcerpts.php
Modified: trunk/extensions/MobileFrontend/MobileFrontend.php
===================================================================
--- trunk/extensions/MobileFrontend/MobileFrontend.php 2012-03-19 12:19:58 UTC
(rev 114129)
+++ trunk/extensions/MobileFrontend/MobileFrontend.php 2012-03-19 12:24:12 UTC
(rev 114130)
@@ -52,7 +52,7 @@
'ApiMobileView' => 'api/ApiMobileView',
'ApiParseExtender' => 'api/ApiParseExtender',
- 'ApiQueryExtracts' => 'api/ApiQueryExcerpts',
+ 'ApiQueryExtracts' => 'api/ApiQueryExtracts',
'MobileFrontendTemplate' => 'templates/MobileFrontendTemplate',
'ApplicationTemplate' => 'templates/ApplicationTemplate',
Deleted: trunk/extensions/MobileFrontend/api/ApiQueryExcerpts.php
===================================================================
--- trunk/extensions/MobileFrontend/api/ApiQueryExcerpts.php 2012-03-19
12:19:58 UTC (rev 114129)
+++ trunk/extensions/MobileFrontend/api/ApiQueryExcerpts.php 2012-03-19
12:24:12 UTC (rev 114130)
@@ -1,369 +0,0 @@
-<?php
-
-class ApiQueryExtracts extends ApiQueryBase {
- const SECTION_MARKER_START = "\1\2";
- const SECTION_MARKER_END = "\2\1";
-
- /**
- * @var ParserOptions
- */
- private $parserOptions;
- private $params;
-
- public function __construct( $query, $moduleName ) {
- parent::__construct( $query, $moduleName, 'ex' );
- }
-
- public function execute() {
- wfProfileIn( __METHOD__ );
- $titles = $this->getPageSet()->getGoodTitles();
- if ( count( $titles ) == 0 ) {
- wfProfileOut( __METHOD__ );
- return;
- }
- $isXml = $this->getMain()->getPrinter()->getFormat() == 'XML';
- $result = $this->getResult();
- $params = $this->params = $this->extractRequestParams();
- $continue = 0;
- $limit = intval( $params['limit'] );
- if ( $limit > 1 && !$params['intro'] ) {
- $limit = 1;
- ///@todo:
- //$result->setWarning( "Provided limit was too large
for requests for whole article extracts, lowered to $limit" );
- }
- if ( isset( $params['continue'] ) ) {
- $continue = intval( $params['continue'] );
- if ( $continue < 0 || $continue > count( $titles ) ) {
- $this->dieUsageMsg( '_badcontinue' );
- }
- $titles = array_slice( $titles, $continue, null, true );
- }
- $count = 0;
- foreach ( $titles as $id => $t ) {
- if ( ++$count > $limit ) {
- $this->setContinueEnumParameter( 'continue',
$continue + $count - 1 );
- break;
- }
- $text = $this->getExtract( $t );
- if ( isset( $params['length'] ) ) {
- $text = $this->trimText( $text );
- }
- if ( $isXml ) {
- $fit = $result->addValue( array( 'query',
'pages', $id ), 'extract', array( '*' => $text ) );
- } else {
- $fit = $result->addValue( array( 'query',
'pages', $id ), 'extract', $text );
- }
- if ( !$fit ) {
- $this->setContinueEnumParameter( 'continue',
$continue + $count - 1 );
- break;
- }
- }
- wfProfileOut( __METHOD__ );
- }
-
- /**
- * OpenSearchXml hook handler
- * @param array $results
- */
- public static function onOpenSearchXml( &$results ) {
- global $wgMFExtendOpenSearchXml;
- if ( !$wgMFExtendOpenSearchXml || !count( $results ) ) {
- return true;
- }
- $pageIds = array_keys( $results );
- $api = new ApiMain( new FauxRequest(
- array(
- 'action' => 'query',
- 'prop' => 'excerpts',
- 'explaintext' => true,
- 'exlimit' => count( $results ),
- 'pageids' => implode( '|', $pageIds ),
- ) )
- );
- $api->execute();
- $data = $api->getResultData();
- foreach ( $pageIds as $id ) {
- if ( isset( $data['query']['pages'][$id]['excerpts'][0]
) ) {
- $results[$id]['extract'] =
$data['query']['pages'][$id]['extract'][0];
- $results[$id]['extract trimmed'] = false;
- }
- }
- return true;
- }
-
- /**
- * Returns a processed, but not trimmed excerpt
- * @param Title $title
- * @return string
- */
- private function getExtract( Title $title ) {
- wfProfileIn( __METHOD__ );
- $page = WikiPage::factory( $title );
-
- $introOnly = $this->params['intro'];
- $text = $this->getFromCache( $page, $introOnly );
- // if we need just first section, try retrieving full page and
getting first section out of it
- if ( $text === false && $introOnly ) {
- $text = $this->getFromCache( $page, false );
- if ( $text !== false ) {
- $text = $this->getFirstSection( $text,
$this->params['plaintext'] );
- }
- }
- if ( $text === false ) {
- $text = $this->parse( $page );
- $text = $this->convertText( $text, $title,
$this->params['plaintext'] );
- $this->setCache( $page, $text );
- }
- wfProfileOut( __METHOD__ );
- return $text;
- }
-
- private function cacheKey( WikiPage $page, $introOnly ) {
- return wfMemcKey( 'mf', 'extract', $page->getLatest(),
$this->params['plaintext'], $introOnly );
- }
-
- private function getFromCache( WikiPage $page, $introOnly ) {
- global $wgMemc;
-
- $key = $this->cacheKey( $page, $introOnly );
- return $wgMemc->get( $key );
- }
-
- private function setCache( WikiPage $page, $text ) {
- global $wgMemc;
-
- $key = $this->cacheKey( $page, $this->params['intro'] );
- $wgMemc->set( $key, $text );
- }
-
- private function getFirstSection( $text, $plainText ) {
- if ( $plainText ) {
- $regexp = '/^(.*?)(?=' . self::SECTION_MARKER_START .
')/s';
- } else {
- $regexp = '/^(.*?)(?=<h[1-6]\b)/s';
- }
- if ( preg_match( $regexp, $text, $matches ) ) {
- wfDebugDieBacktrace();
- $text = $matches[0];
- }
- return $text;
- }
-
- /**
- * Returns page HTML
- * @param WikiPage $page
- * @return string
- */
- private function parse( WikiPage $page ) {
- wfProfileIn( __METHOD__ );
- if ( !$this->parserOptions ) {
- $this->parserOptions = new ParserOptions( new User(
'127.0.0.1' ) );
- }
- // first try finding full page in parser cache
- if ( $page->isParserCacheUsed( $this->parserOptions, 0 ) ) {
- $pout = ParserCache::singleton()->get( $page,
$this->parserOptions );
- if ( $pout ) {
- $text = $pout->getText();
- if ( $this->params['intro'] ) {
- $text = $this->getFirstSection( $text,
false );
- }
- wfProfileOut( __METHOD__ );
- return $text;
- }
- }
- $request = array(
- 'action' => 'parse',
- 'page' => $page->getTitle()->getPrefixedText(),
- 'prop' => 'text'
- );
- if ( $this->params['intro'] ) {
- $request['section'] = 0;
- }
- // in case of cache miss, render just the needed section
- $api = new ApiMain( new FauxRequest( $request ) );
- $api->execute();
- $data = $api->getResultData();
- wfProfileOut( __METHOD__ );
- return $data['parse']['text']['*'];
- }
-
- /**
- * Converts page HTML into an excerpt
- * @param string $text
- * @param Title $title
- * @param bool $plainText
- * @return string
- */
- private function convertText( $text ) {
- wfProfileIn( __METHOD__ );
- $fmt = new ExtractFormatter( $text, $this->params['plaintext'],
$this->params['sectionformat'] );
- $text = $fmt->getText();
-
- wfProfileOut( __METHOD__ );
- return trim( $text );
- }
-
- /**
- *
- * @param string $text
- * @param int $requestedLength
- * @param bool $plainText
- * @return string
- */
- private function trimText( $text, $requestedLength, $plainText ) {
- global $wgUseTidy;
-
- wfProfileIn( __METHOD__ );
- $length = mb_strlen( $text );
- if ( $length <= $requestedLength ) {
- wfProfileOut( __METHOD__ );
- return $text;
- }
- $pattern = "#^.{{$requestedLength}}[\\w/]*>?#su";
- preg_match( $pattern, $text, $m );
- $text = $m[0];
- // Fix possibly unclosed tags
- if ( $wgUseTidy && !$plainText ) {
- $text = trim ( MWTidy::tidy( $text ) );
- }
- $text .= wfMessage( 'ellipsis' )->inContentLanguage()->text();
- wfProfileOut( __METHOD__ );
- return $text;
- }
-
- public function getAllowedParams() {
- return array(
- 'length' => array(
- ApiBase::PARAM_TYPE => 'integer',
- ApiBase::PARAM_MIN => 1,
- ),
- 'limit' => array(
- ApiBase::PARAM_DFLT => 1,
- ApiBase::PARAM_TYPE => 'limit',
- ApiBase::PARAM_MIN => 1,
- ApiBase::PARAM_MAX => 20,
- ApiBase::PARAM_MAX2 => 20,
- ),
- 'intro' => false,
- 'plaintext' => false,
- 'sectionformat' => array(
- ApiBase::PARAM_TYPE =>
ExtractFormatter::$sectionFormats,
- ApiBase::PARAM_DFLT => 'wiki',
- ),
- 'continue' => array(
- ApiBase::PARAM_TYPE => 'integer',
- ),
- );
- }
-
- public function getParamDescription() {
- return array(
- 'length' => 'How many characters to return, actual text
returned might be slightly longer.',
- 'limit' => 'How many extracts to return. ',
- 'intro' => 'Return only content before the first
section',
- 'plaintext' => 'Return extracts as plaintext instead of
limited HTML',
- 'sectionformat' => array(
- 'How to format sections in plaintext mode:',
- ' none - No formatting',
- ' wiki - Wikitext-style formatting == like this
==',
- " raw - Return in this module's internal
representation (secton titles prefixed with <ASCII 1><ASCII 2><section
level><ASCII 2><ASCII 1>",
- ),
- 'continue' => 'When more results are available, use
this to continue',
- );
- }
-
- public function getDescription() {
- return 'Returns plain-text or limited HTML extracts of the
given page(s)';
- }
-
- public function getPossibleErrors() {
- return array_merge( parent::getPossibleErrors(), array(
- array( 'code' => '_badcontinue', 'info' => 'Invalid
continue param. You should pass the original value returned by the previous
query' ),
- ) );
- }
-
- public function getExamples() {
- return array(
-
'api.php?action=query&prop=extracts&exlength=175&titles=Therion' => 'Get a
175-character extract',
- );
- }
-
-
- public function getHelpUrls() {
- return
'https://www.mediawiki.org/wiki/Extension:MobileFrontend#New_API';
- }
-
- public function getVersion() {
- return __CLASS__ . ': $Id$';
- }
-}
-
-class ExtractFormatter extends HtmlFormatter {
- private $plainText;
- private $sectionFormat;
-
- public static $sectionFormats = array(
- 'none',
- 'wiki',
- 'raw',
- );
-
- public function __construct( $text, $plainText, $sectionFormat ) {
- parent::__construct( HtmlFormatter::wrapHTML( $text ) );
- $this->plainText = $plainText;
- $this->sectionFormat = $sectionFormat;
-
- $this->removeImages();
- $this->remove( array( 'table', 'div', '.editsection',
'sup.reference', 'span.coordinates',
- 'span.geo-multi-punct', 'span.geo-nondefault',
'.noexcerpt', '.error' )
- );
- if ( $plainText ) {
- $this->flattenAllTags();
- } else {
- $this->flatten( array( 'span', 'a' ) );
- }
- }
-
- public function getText( $dummy = null ) {
- $this->filterContent();
- $text = parent::getText();
- if ( $this->plainText ) {
- $text = html_entity_decode( $text );
- $text = str_replace( "\r", "\n", $text );
- $text = preg_replace( "/\n{3,}/", "\n\n", $text );
- $text = preg_replace_callback(
- "/" . ApiQueryExtracts::SECTION_MARKER_START .
'(\d)'. ApiQueryExtracts::SECTION_MARKER_END . "(.*?)$/m",
- array( $this, 'sectionCallback' ),
- $text
- );
- }
- return $text;
- }
-
- public function onHtmlReady( $html ) {
- if ( $this->plainText ) {
- $html = preg_replace( '/\s*(<h([1-6])\b)/i',
- ApiQueryExtracts::SECTION_MARKER_START . '$2' .
ApiQueryExtracts::SECTION_MARKER_END . '$1' ,
- $html
- );
- }
- return $html;
- }
-
- private function sectionCallback( $matches ) {
- if ( $this->sectionFormat == 'raw' ) {
- return $matches[0];
- }
- $func = "ExtractFormatter::doSection_{$this->sectionFormat}";
- return call_user_func( $func, $matches[1], trim( $matches[2] )
);
- }
-
- private static function doSection_wiki( $level, $text ) {
- $bars = str_repeat( '=', $level );
- return "\n$bars $text $bars";
- }
-
- private static function doSection_none( $level, $text ) {
- return "\n$text";
- }
-}
\ No newline at end of file
Copied: trunk/extensions/MobileFrontend/api/ApiQueryExtracts.php (from rev
114129, trunk/extensions/MobileFrontend/api/ApiQueryExcerpts.php)
===================================================================
--- trunk/extensions/MobileFrontend/api/ApiQueryExtracts.php
(rev 0)
+++ trunk/extensions/MobileFrontend/api/ApiQueryExtracts.php 2012-03-19
12:24:12 UTC (rev 114130)
@@ -0,0 +1,369 @@
+<?php
+
+class ApiQueryExtracts extends ApiQueryBase {
+ const SECTION_MARKER_START = "\1\2";
+ const SECTION_MARKER_END = "\2\1";
+
+ /**
+ * @var ParserOptions
+ */
+ private $parserOptions;
+ private $params;
+
+ public function __construct( $query, $moduleName ) {
+ parent::__construct( $query, $moduleName, 'ex' );
+ }
+
+ public function execute() {
+ wfProfileIn( __METHOD__ );
+ $titles = $this->getPageSet()->getGoodTitles();
+ if ( count( $titles ) == 0 ) {
+ wfProfileOut( __METHOD__ );
+ return;
+ }
+ $isXml = $this->getMain()->getPrinter()->getFormat() == 'XML';
+ $result = $this->getResult();
+ $params = $this->params = $this->extractRequestParams();
+ $continue = 0;
+ $limit = intval( $params['limit'] );
+ if ( $limit > 1 && !$params['intro'] ) {
+ $limit = 1;
+ ///@todo:
+ //$result->setWarning( "Provided limit was too large
for requests for whole article extracts, lowered to $limit" );
+ }
+ if ( isset( $params['continue'] ) ) {
+ $continue = intval( $params['continue'] );
+ if ( $continue < 0 || $continue > count( $titles ) ) {
+ $this->dieUsageMsg( '_badcontinue' );
+ }
+ $titles = array_slice( $titles, $continue, null, true );
+ }
+ $count = 0;
+ foreach ( $titles as $id => $t ) {
+ if ( ++$count > $limit ) {
+ $this->setContinueEnumParameter( 'continue',
$continue + $count - 1 );
+ break;
+ }
+ $text = $this->getExtract( $t );
+ if ( isset( $params['length'] ) ) {
+ $text = $this->trimText( $text );
+ }
+ if ( $isXml ) {
+ $fit = $result->addValue( array( 'query',
'pages', $id ), 'extract', array( '*' => $text ) );
+ } else {
+ $fit = $result->addValue( array( 'query',
'pages', $id ), 'extract', $text );
+ }
+ if ( !$fit ) {
+ $this->setContinueEnumParameter( 'continue',
$continue + $count - 1 );
+ break;
+ }
+ }
+ wfProfileOut( __METHOD__ );
+ }
+
+ /**
+ * OpenSearchXml hook handler
+ * @param array $results
+ */
+ public static function onOpenSearchXml( &$results ) {
+ global $wgMFExtendOpenSearchXml;
+ if ( !$wgMFExtendOpenSearchXml || !count( $results ) ) {
+ return true;
+ }
+ $pageIds = array_keys( $results );
+ $api = new ApiMain( new FauxRequest(
+ array(
+ 'action' => 'query',
+ 'prop' => 'excerpts',
+ 'explaintext' => true,
+ 'exlimit' => count( $results ),
+ 'pageids' => implode( '|', $pageIds ),
+ ) )
+ );
+ $api->execute();
+ $data = $api->getResultData();
+ foreach ( $pageIds as $id ) {
+ if ( isset( $data['query']['pages'][$id]['excerpts'][0]
) ) {
+ $results[$id]['extract'] =
$data['query']['pages'][$id]['extract'][0];
+ $results[$id]['extract trimmed'] = false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Returns a processed, but not trimmed excerpt
+ * @param Title $title
+ * @return string
+ */
+ private function getExtract( Title $title ) {
+ wfProfileIn( __METHOD__ );
+ $page = WikiPage::factory( $title );
+
+ $introOnly = $this->params['intro'];
+ $text = $this->getFromCache( $page, $introOnly );
+ // if we need just first section, try retrieving full page and
getting first section out of it
+ if ( $text === false && $introOnly ) {
+ $text = $this->getFromCache( $page, false );
+ if ( $text !== false ) {
+ $text = $this->getFirstSection( $text,
$this->params['plaintext'] );
+ }
+ }
+ if ( $text === false ) {
+ $text = $this->parse( $page );
+ $text = $this->convertText( $text, $title,
$this->params['plaintext'] );
+ $this->setCache( $page, $text );
+ }
+ wfProfileOut( __METHOD__ );
+ return $text;
+ }
+
+ private function cacheKey( WikiPage $page, $introOnly ) {
+ return wfMemcKey( 'mf', 'extract', $page->getLatest(),
$this->params['plaintext'], $introOnly );
+ }
+
+ private function getFromCache( WikiPage $page, $introOnly ) {
+ global $wgMemc;
+
+ $key = $this->cacheKey( $page, $introOnly );
+ return $wgMemc->get( $key );
+ }
+
+ private function setCache( WikiPage $page, $text ) {
+ global $wgMemc;
+
+ $key = $this->cacheKey( $page, $this->params['intro'] );
+ $wgMemc->set( $key, $text );
+ }
+
+ private function getFirstSection( $text, $plainText ) {
+ if ( $plainText ) {
+ $regexp = '/^(.*?)(?=' . self::SECTION_MARKER_START .
')/s';
+ } else {
+ $regexp = '/^(.*?)(?=<h[1-6]\b)/s';
+ }
+ if ( preg_match( $regexp, $text, $matches ) ) {
+ wfDebugDieBacktrace();
+ $text = $matches[0];
+ }
+ return $text;
+ }
+
+ /**
+ * Returns page HTML
+ * @param WikiPage $page
+ * @return string
+ */
+ private function parse( WikiPage $page ) {
+ wfProfileIn( __METHOD__ );
+ if ( !$this->parserOptions ) {
+ $this->parserOptions = new ParserOptions( new User(
'127.0.0.1' ) );
+ }
+ // first try finding full page in parser cache
+ if ( $page->isParserCacheUsed( $this->parserOptions, 0 ) ) {
+ $pout = ParserCache::singleton()->get( $page,
$this->parserOptions );
+ if ( $pout ) {
+ $text = $pout->getText();
+ if ( $this->params['intro'] ) {
+ $text = $this->getFirstSection( $text,
false );
+ }
+ wfProfileOut( __METHOD__ );
+ return $text;
+ }
+ }
+ $request = array(
+ 'action' => 'parse',
+ 'page' => $page->getTitle()->getPrefixedText(),
+ 'prop' => 'text'
+ );
+ if ( $this->params['intro'] ) {
+ $request['section'] = 0;
+ }
+ // in case of cache miss, render just the needed section
+ $api = new ApiMain( new FauxRequest( $request ) );
+ $api->execute();
+ $data = $api->getResultData();
+ wfProfileOut( __METHOD__ );
+ return $data['parse']['text']['*'];
+ }
+
+ /**
+ * Converts page HTML into an excerpt
+ * @param string $text
+ * @param Title $title
+ * @param bool $plainText
+ * @return string
+ */
+ private function convertText( $text ) {
+ wfProfileIn( __METHOD__ );
+ $fmt = new ExtractFormatter( $text, $this->params['plaintext'],
$this->params['sectionformat'] );
+ $text = $fmt->getText();
+
+ wfProfileOut( __METHOD__ );
+ return trim( $text );
+ }
+
+ /**
+ *
+ * @param string $text
+ * @param int $requestedLength
+ * @param bool $plainText
+ * @return string
+ */
+ private function trimText( $text, $requestedLength, $plainText ) {
+ global $wgUseTidy;
+
+ wfProfileIn( __METHOD__ );
+ $length = mb_strlen( $text );
+ if ( $length <= $requestedLength ) {
+ wfProfileOut( __METHOD__ );
+ return $text;
+ }
+ $pattern = "#^.{{$requestedLength}}[\\w/]*>?#su";
+ preg_match( $pattern, $text, $m );
+ $text = $m[0];
+ // Fix possibly unclosed tags
+ if ( $wgUseTidy && !$plainText ) {
+ $text = trim ( MWTidy::tidy( $text ) );
+ }
+ $text .= wfMessage( 'ellipsis' )->inContentLanguage()->text();
+ wfProfileOut( __METHOD__ );
+ return $text;
+ }
+
+ public function getAllowedParams() {
+ return array(
+ 'length' => array(
+ ApiBase::PARAM_TYPE => 'integer',
+ ApiBase::PARAM_MIN => 1,
+ ),
+ 'limit' => array(
+ ApiBase::PARAM_DFLT => 1,
+ ApiBase::PARAM_TYPE => 'limit',
+ ApiBase::PARAM_MIN => 1,
+ ApiBase::PARAM_MAX => 20,
+ ApiBase::PARAM_MAX2 => 20,
+ ),
+ 'intro' => false,
+ 'plaintext' => false,
+ 'sectionformat' => array(
+ ApiBase::PARAM_TYPE =>
ExtractFormatter::$sectionFormats,
+ ApiBase::PARAM_DFLT => 'wiki',
+ ),
+ 'continue' => array(
+ ApiBase::PARAM_TYPE => 'integer',
+ ),
+ );
+ }
+
+ public function getParamDescription() {
+ return array(
+ 'length' => 'How many characters to return, actual text
returned might be slightly longer.',
+ 'limit' => 'How many extracts to return. ',
+ 'intro' => 'Return only content before the first
section',
+ 'plaintext' => 'Return extracts as plaintext instead of
limited HTML',
+ 'sectionformat' => array(
+ 'How to format sections in plaintext mode:',
+ ' none - No formatting',
+ ' wiki - Wikitext-style formatting == like this
==',
+ " raw - Return in this module's internal
representation (secton titles prefixed with <ASCII 1><ASCII 2><section
level><ASCII 2><ASCII 1>",
+ ),
+ 'continue' => 'When more results are available, use
this to continue',
+ );
+ }
+
+ public function getDescription() {
+ return 'Returns plain-text or limited HTML extracts of the
given page(s)';
+ }
+
+ public function getPossibleErrors() {
+ return array_merge( parent::getPossibleErrors(), array(
+ array( 'code' => '_badcontinue', 'info' => 'Invalid
continue param. You should pass the original value returned by the previous
query' ),
+ ) );
+ }
+
+ public function getExamples() {
+ return array(
+
'api.php?action=query&prop=extracts&exlength=175&titles=Therion' => 'Get a
175-character extract',
+ );
+ }
+
+
+ public function getHelpUrls() {
+ return
'https://www.mediawiki.org/wiki/Extension:MobileFrontend#New_API';
+ }
+
+ public function getVersion() {
+ return __CLASS__ . ': $Id$';
+ }
+}
+
+class ExtractFormatter extends HtmlFormatter {
+ private $plainText;
+ private $sectionFormat;
+
+ public static $sectionFormats = array(
+ 'none',
+ 'wiki',
+ 'raw',
+ );
+
+ public function __construct( $text, $plainText, $sectionFormat ) {
+ parent::__construct( HtmlFormatter::wrapHTML( $text ) );
+ $this->plainText = $plainText;
+ $this->sectionFormat = $sectionFormat;
+
+ $this->removeImages();
+ $this->remove( array( 'table', 'div', '.editsection',
'sup.reference', 'span.coordinates',
+ 'span.geo-multi-punct', 'span.geo-nondefault',
'.noexcerpt', '.error' )
+ );
+ if ( $plainText ) {
+ $this->flattenAllTags();
+ } else {
+ $this->flatten( array( 'span', 'a' ) );
+ }
+ }
+
+ public function getText( $dummy = null ) {
+ $this->filterContent();
+ $text = parent::getText();
+ if ( $this->plainText ) {
+ $text = html_entity_decode( $text );
+ $text = str_replace( "\r", "\n", $text );
+ $text = preg_replace( "/\n{3,}/", "\n\n", $text );
+ $text = preg_replace_callback(
+ "/" . ApiQueryExtracts::SECTION_MARKER_START .
'(\d)'. ApiQueryExtracts::SECTION_MARKER_END . "(.*?)$/m",
+ array( $this, 'sectionCallback' ),
+ $text
+ );
+ }
+ return $text;
+ }
+
+ public function onHtmlReady( $html ) {
+ if ( $this->plainText ) {
+ $html = preg_replace( '/\s*(<h([1-6])\b)/i',
+ ApiQueryExtracts::SECTION_MARKER_START . '$2' .
ApiQueryExtracts::SECTION_MARKER_END . '$1' ,
+ $html
+ );
+ }
+ return $html;
+ }
+
+ private function sectionCallback( $matches ) {
+ if ( $this->sectionFormat == 'raw' ) {
+ return $matches[0];
+ }
+ $func = "ExtractFormatter::doSection_{$this->sectionFormat}";
+ return call_user_func( $func, $matches[1], trim( $matches[2] )
);
+ }
+
+ private static function doSection_wiki( $level, $text ) {
+ $bars = str_repeat( '=', $level );
+ return "\n$bars $text $bars";
+ }
+
+ private static function doSection_none( $level, $text ) {
+ return "\n$text";
+ }
+}
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
