Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Followup r75554, functionise Export code, allows for return to be used "non scarily"

Browse source 
Remove some extra blank comment lines
This commit is contained in:
Sam Reed 2010-10-29 12:20:11 +00:00
parent 2c5256e63e
commit 2b81e29ac5
2 changed files with 48 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
includes/api/ApiQuery.php
View file

@ -383,9 +383,7 @@ class ApiQuery extends ApiBase {
$result->addValue( 'query', 'redirects', $redirValues );
}
//
// Missing revision elements
//
$missingRevIDs = $pageSet->getMissingRevisionIDs();
if ( count( $missingRevIDs ) ) {
$revids = array();
@ -398,9 +396,7 @@ class ApiQuery extends ApiBase {
$result->addValue( 'query', 'badrevids', $revids );
}
//
// Page elements
//
$pages = array();
// Report any missing titles
@ -457,48 +453,57 @@ class ApiQuery extends ApiBase {
$result->addValue( 'query', 'pages', $pages );
}
if ( $this->params['export'] ) {
$exportTitles = array();
$titles = $pageSet->getGoodTitles();
if( count( $titles ) ) {
foreach ( $titles as $title ) {
if ( $title->userCanRead() ) {
$exportTitles[] = $title;
}
$this->doExport( $pageSet, $result );
}
}
/**
* @param $pageSet ApiPageSet
* @param $result ApiResult
* @return
*/
private function doExport( $pageSet, $result ) {
$exportTitles = array();
$titles = $pageSet->getGoodTitles();
if( count( $titles ) ) {
foreach ( $titles as $title ) {
if ( $title->userCanRead() ) {
$exportTitles[] = $title;
}
}
//export, when there are titles
if ( !count( $exportTitles ) ) {
return;
}
$exporter = new WikiExporter( $this->getDB() );
// WikiExporter writes to stdout, so catch its
// output with an ob
ob_start();
$exporter->openStream();
foreach ( $exportTitles as $title ) {
$exporter->pageByTitle( $title );
}
$exporter->closeStream();
$exportxml = ob_get_contents();
ob_end_clean();
// Don't check the size of exported stuff
// It's not continuable, so it would cause more
// problems than it'd solve
$result->disableSizeCheck();
if ( $this->params['exportnowrap'] ) {
$result->reset();
// Raw formatter will handle this
$result->addValue( null, 'text', $exportxml );
$result->addValue( null, 'mime', 'text/xml' );
} else {
$r = array();
ApiResult::setContent( $r, $exportxml );
$result->addValue( 'query', 'export', $r );
}
$result->enableSizeCheck();
}
// only export when there are titles
if ( !count( $exportTitles ) ) {
return;
}
$exporter = new WikiExporter( $this->getDB() );
// WikiExporter writes to stdout, so catch its
// output with an ob
ob_start();
$exporter->openStream();
foreach ( $exportTitles as $title ) {
$exporter->pageByTitle( $title );
}
$exporter->closeStream();
$exportxml = ob_get_contents();
ob_end_clean();
// Don't check the size of exported stuff
// It's not continuable, so it would cause more
// problems than it'd solve
$result->disableSizeCheck();
if ( $this->params['exportnowrap'] ) {
$result->reset();
// Raw formatter will handle this
$result->addValue( null, 'text', $exportxml );
$result->addValue( null, 'mime', 'text/xml' );
} else {
$r = array();
ApiResult::setContent( $r, $exportxml );
$result->addValue( 'query', 'export', $r );
}
$result->enableSizeCheck();
}
/**

1
includes/api/ApiRsd.php
View file

@ -41,7 +41,6 @@ class ApiRsd extends ApiBase {
public function execute() {
$result = $this->getResult();
$result->addValue( null, 'version', '1.0' );
$result->addValue( null, 'xmlns', 'http://archipelago.phrasewise.com/rsd' );