http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98087
Revision: 98087
Author: jeroendedauw
Date: 2011-09-25 22:10:02 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
migrate param handling
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_CSV.php
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_List.php
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_RDF.php
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_RSSlink.php
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Table.php
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QueryPrinter.php
Modified:
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_CSV.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_CSV.php
2011-09-25 22:05:26 UTC (rev 98086)
+++ trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_CSV.php
2011-09-25 22:10:02 UTC (rev 98087)
@@ -94,14 +94,14 @@
$link->setParameter( 'csv', 'format' );
$link->setParameter( $this->m_sep, 'sep' );
- if ( array_key_exists( 'mainlabel', $this->m_params )
&& $this->m_params['mainlabel'] !== false ) {
- $link->setParameter(
$this->m_params['mainlabel'], 'mainlabel' );
+ if ( array_key_exists( 'mainlabel', $this->params ) &&
$this->params['mainlabel'] !== false ) {
+ $link->setParameter(
$this->params['mainlabel'], 'mainlabel' );
}
$link->setParameter( $this->mShowHeaders ? 'show' :
'hide', 'headers' );
- if ( array_key_exists( 'limit', $this->m_params ) ) {
- $link->setParameter( $this->m_params['limit'],
'limit' );
+ if ( array_key_exists( 'limit', $this->params ) ) {
+ $link->setParameter( $this->params['limit'],
'limit' );
} else { // use a reasonable default limit
$link->setParameter( 100, 'limit' );
}
Modified:
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_List.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_List.php
2011-09-25 22:05:26 UTC (rev 98086)
+++ trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_List.php
2011-09-25 22:10:02 UTC (rev 98087)
@@ -251,8 +251,8 @@
if ( $this->mTemplate != '' ) {
$link->setParameter( $this->mTemplate, 'template' );
- if ( array_key_exists( 'link', $this->m_params ) ) { //
linking may interfere with templates
- $link->setParameter( $this->m_params['link'],
'link' );
+ if ( array_key_exists( 'link', $this->params ) ) { //
linking may interfere with templates
+ $link->setParameter( $this->params['link'],
'link' );
}
}
Modified:
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_RDF.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_RDF.php
2011-09-25 22:05:26 UTC (rev 98086)
+++ trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_RDF.php
2011-09-25 22:10:02 UTC (rev 98087)
@@ -102,8 +102,8 @@
$link->setParameter( 'rdf', 'format' );
$link->setParameter( $this->syntax, 'syntax' );
- if ( array_key_exists( 'limit', $this->m_params ) ) {
- $link->setParameter( $this->m_params['limit'],
'limit' );
+ if ( array_key_exists( 'limit', $this->params ) ) {
+ $link->setParameter( $this->params['limit'],
'limit' );
} else { // use a reasonable default limit
$link->setParameter( 100, 'limit' );
}
Modified:
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_RSSlink.php
===================================================================
---
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_RSSlink.php
2011-09-25 22:05:26 UTC (rev 98086)
+++
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_RSSlink.php
2011-09-25 22:10:02 UTC (rev 98087)
@@ -10,34 +10,36 @@
*
* @author Denny Vrandecic
* @author Markus Krötzsch
+ *
* @ingroup SMWQuery
*/
class SMWRSSResultPrinter extends SMWResultPrinter {
+
protected $m_title = '';
protected $m_description = '';
- protected function readParameters( $params, $outputmode ) {
- parent::readParameters( $params, $outputmode );
- if ( array_key_exists( 'title', $this->m_params ) ) {
- $this->m_title = trim( $this->m_params['title'] );
- // for backward compatibiliy
- } elseif ( array_key_exists( 'rsstitle', $this->m_params ) ) {
- $this->m_title = trim( $this->m_params['rsstitle'] );
- }
- if ( array_key_exists( 'description', $this->m_params ) ) {
- $this->m_description = trim(
$this->m_params['description'] );
- // for backward compatibiliy
- } elseif ( array_key_exists( 'rssdescription', $this->m_params
) ) {
- $this->m_description = trim(
$this->m_params['rssdescription'] );
- }
+ /**
+ * @see SMWResultPrinter::handleParameters
+ *
+ * @since 1.6.3
+ *
+ * @param array $params
+ * @param $outputmode
+ */
+ protected function handleParameters( array $params, $outputmode ) {
+ parent::handleParameters( $params, $outputmode );
+
+ $this->m_title = trim( $params['title'] );
+ $this->m_description = trim( $params['description'] );
}
-
+
public function getMimeType( $res ) {
- return 'application/rss+xml'; // or is rdf+xml better? Might be
confused in either case (with RSS2.0 or RDF)
+ // or is rdf+xml better? Might be confused in either case (with
RSS2.0 or RDF)
+ return 'application/rss+xml';
}
public function getQueryMode( $context ) {
- return ( $context == SMWQueryProcessor::SPECIAL_PAGE ) ?
SMWQuery::MODE_INSTANCES:SMWQuery::MODE_NONE;
+ return $context == SMWQueryProcessor::SPECIAL_PAGE ?
SMWQuery::MODE_INSTANCES : SMWQuery::MODE_NONE;
}
public function getName() {
@@ -153,9 +155,11 @@
$params['title'] = new Parameter( 'title' );
$params['title']->setMessage( 'smw_paramdesc_rsstitle' );
+ $params['title']->setDefault( '' );
$params['description'] = new Parameter( 'title' );
$params['description']->setMessage(
'smw_paramdesc_rssdescription' );
+ $params['description']->setDefault( '' );
return $params;
}
Modified:
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Table.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Table.php
2011-09-25 22:05:26 UTC (rev 98086)
+++ trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Table.php
2011-09-25 22:10:02 UTC (rev 98087)
@@ -13,11 +13,6 @@
protected $mHTMLClass = '';
- public function __construct( $format, $inline, $useValidator = true ) {
- parent::__construct( $format, $inline );
- $this->useValidator = $useValidator;
- }
-
public function getName() {
smwfLoadExtensionMessages( 'SemanticMediaWiki' );
return wfMsg( 'smw_printername_' . $this->mFormat );
Modified:
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QueryPrinter.php
===================================================================
---
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QueryPrinter.php
2011-09-25 22:05:26 UTC (rev 98086)
+++
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QueryPrinter.php
2011-09-25 22:10:02 UTC (rev 98087)
@@ -296,6 +296,7 @@
*/
protected function handleParameters( array $params, $outputmode ) {
$this->params = $params;
+ $this->m_params = $params; // Compat, change made in 1.6.3
if ( array_key_exists( 'intro', $params ) ) { $this->mIntro =
$params['intro']; }
if ( array_key_exists( 'outro', $params ) ) { $this->mOutro =
$params['outro']; }
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
