http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72999
Revision: 72999
Author: jeroendedauw
Date: 2010-09-14 17:53:00 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
Minor improvements
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/SMW_ParserExtensions.php
trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_ParserExtensions.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_ParserExtensions.php
2010-09-14 17:42:29 UTC (rev 72998)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_ParserExtensions.php
2010-09-14 17:53:00 UTC (rev 72999)
@@ -185,7 +185,7 @@
* called during SMW initialisation. Note that parser hooks are
something different
* than MW hooks in general, which explains the two-level registration.
*/
- public static function registerParserFunctions( &$parser ) {
+ public static function registerParserFunctions( Parser &$parser ) {
$parser->setFunctionHook( 'ask', array( 'SMWParserExtensions',
'doAsk' ) );
$parser->setFunctionHook( 'show', array( 'SMWParserExtensions',
'doShow' ) );
$parser->setFunctionHook( 'info', array( 'SMWParserExtensions',
'doInfo' ) );
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
2010-09-14 17:42:29 UTC (rev 72998)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
2010-09-14 17:53:00 UTC (rev 72999)
@@ -31,6 +31,8 @@
* The format string is used to specify the output format if already
* known. Otherwise it will be determined from the parameters when
* needed. This parameter is just for optimisation in a common case.
+ *
+ * @return SMWQuery
*/
static public function createQuery( $querystring, array $params,
$context = SMWQueryProcessor::INLINE_QUERY, $format = '', $extraprintouts =
array() ) {
global $smwgQDefaultNamespaces, $smwgQFeatures,
$smwgQConceptFeatures;
@@ -263,12 +265,13 @@
$format = SMWQueryProcessor::getResultFormat( $params );
$query = SMWQueryProcessor::createQuery( $querystring,
$params, $context, $format, $extraprintouts );
$result = SMWQueryProcessor::getResultFromQuery( $query,
$params, $extraprintouts, $outputmode, $context, $format );
+
wfProfileOut( 'SMWQueryProcessor::getResultFromQueryString
(SMW)' );
return $result;
}
- static public function getResultFromQuery( $query, array $params,
$extraprintouts, $outputmode, $context = SMWQueryProcessor::INLINE_QUERY,
$format = '' ) {
+ static public function getResultFromQuery( SMWQuery $query, array
$params, $extraprintouts, $outputmode, $context =
SMWQueryProcessor::INLINE_QUERY, $format = '' ) {
wfProfileIn( 'SMWQueryProcessor::getResultFromQuery (SMW)' );
// Query routing allows extensions to provide alternative
stores as data sources
@@ -276,8 +279,8 @@
///TODO: case-insensitive
global $smwgQuerySources;
- if ( array_key_exists( "source", $params ) && array_key_exists(
$params["source"], $smwgQuerySources ) ) {
- $store = new $smwgQuerySources[$params["source"]]();
+ if ( array_key_exists( 'source', $params ) && array_key_exists(
$params['source'], $smwgQuerySources ) ) {
+ $store = new $smwgQuerySources[$params['source']]();
$query->params = $params; // this is a hack
} else {
$store = smwfGetStore(); // default store
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
