http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97805
Revision: 97805
Author: jeroendedauw
Date: 2011-09-22 09:31:46 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
add subject print request to API
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
trunk/extensions/SemanticMediaWiki/includes/api/ApiSMWQuery.php
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
2011-09-22 09:21:54 UTC (rev 97804)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
2011-09-22 09:31:46 UTC (rev 97805)
@@ -186,11 +186,11 @@
return $query;
}
- protected static function addThisPrinteout( array &$printRequests,
array $rawParams ) {
- $rawParams['mainlabel'] = array_key_exists( 'mainlabel',
$rawParams ) ? $rawParams['mainlabel'] : false;
+ public static function addThisPrinteout( array &$printRequests, array
$rawParams, $isShow = false ) {
+ $rawParams['mainlabel'] = ( !$isShow && array_key_exists(
'mainlabel', $rawParams ) ) ? $rawParams['mainlabel'] : false;
$noMainlabel = $rawParams['mainlabel'] === '-';
// !$desc->isSingleton() || count( $printRequests ) == 0 ) && (
!$noMainlabel )
- //var_dump($printRequests);exit;
+
if ( !is_null( $printRequests ) && !$noMainlabel ) {
array_unshift( $printRequests, new SMWPrintRequest(
SMWPrintRequest::PRINT_THIS,
Modified: trunk/extensions/SemanticMediaWiki/includes/api/ApiSMWQuery.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/api/ApiSMWQuery.php
2011-09-22 09:21:54 UTC (rev 97804)
+++ trunk/extensions/SemanticMediaWiki/includes/api/ApiSMWQuery.php
2011-09-22 09:31:46 UTC (rev 97805)
@@ -27,6 +27,8 @@
* @return SMWQuery
*/
protected function getQuery( $queryString, array $printeouts ) {
+ SMWQueryProcessor::addThisPrinteout( $printeouts,
$this->parameters );
+
return SMWQueryProcessor::createQuery(
$queryString,
SMWQueryProcessor::getProcessedParams(
$this->parameters, $printeouts ),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
