http://www.mediawiki.org/wiki/Special:Code/MediaWiki/92426
Revision: 92426
Author: jeroendedauw
Date: 2011-07-18 12:29:53 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
fix bug 29939
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_JSONlink.php
Modified:
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_JSONlink.php
===================================================================
---
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_JSONlink.php
2011-07-18 11:37:22 UTC (rev 92425)
+++
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_JSONlink.php
2011-07-18 12:29:53 UTC (rev 92426)
@@ -58,12 +58,14 @@
while ( ( /* array of SMWResultArray */ $row =
$res->getNext() ) !== false ) {
$rowsubject = false; // the wiki page value
that this row is about
$valuestack = array(); // contains
Property-Value pairs to characterize an Item
+ $addedLabel = false;
foreach ( $row as /* SMWResultArray */ $field )
{
$pr = $field->getPrintRequest();
- if ( $rowsubject === false ) {
+ if ( $rowsubject === false &&
!$addedLabel ) {
$valuestack[] = '"label": "' .
$field->getResultSubject()->getTitle()->getFullText() . '"';
+ $addedLabel = true;
}
if ( $pr->getMode() !=
SMWPrintRequest::PRINT_THIS ) {
@@ -74,7 +76,7 @@
$finalvalues = '';
switch (
$dataValue->getTypeID() ) {
case '_geo':
-
$values[] = '"' . $dataValue->getWikiValue() . '"';
+
$values[] = FormatJson::encode( $dataValue->getDataItem()->getCoordinateSet() );
break;
case '_num':
$values[] = $dataValue->getDataItem()->getNumber();
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
