ValueDescription::getQueryString to set DV output option

includes/datavalues/SMW_DV_Number.php

@@ -42,6 +42,11 @@
  */
 class SMWNumberValue extends SMWDataValue {
 
+	/**
+	 * Internal state to ensure no precision limitation is applied to an output
+	 */
+	const NO_DISP_PRECISION_LIMIT = 'num.no.displayprecision.limit';
+
 	/**
 	 * Array with entries unit=>value, mapping a normalized unit to the
 	 * converted value. Used for conversion tooltips.
@@ -299,10 +304,10 @@ public function getInfolinks() {
 
 		// When generating an infoLink, use the normalized value without any
 		// precision limitation
-		$this->setOption( 'no.displayprecision', true );
+		$this->setOption( self::NO_DISP_PRECISION_LIMIT, true );
 		$this->setOption( 'content.language', Message::CONTENT_LANGUAGE );
 		$infoLinks = parent::getInfolinks();
-		$this->setOption( 'no.displayprecision', false );
+		$this->setOption( self::NO_DISP_PRECISION_LIMIT, false );
 
 		return $infoLinks;
 	}
@@ -453,8 +458,8 @@ public function getUnitList() {
 
 	protected function getPreferredDisplayPrecision() {
 
-		// In case of a value description, don't restrict the value with a display precision
-		if ( $this->getProperty() === null || $this->getOptionBy( 'value.description' ) || $this->getOptionBy( 'no.displayprecision' ) ) {
+		// Don't restrict the value with a display precision
+		if ( $this->getProperty() === null || $this->getOptionBy( self::NO_DISP_PRECISION_LIMIT ) ) {
 			return false;
 		}
 

includes/datavalues/SMW_DV_URI.php

@@ -23,6 +23,11 @@
  */
 class SMWURIValue extends SMWDataValue {
 
+	/**
+	 * Raw value without encoding
+	 */
+	const VALUE_RAW = 'uri.value.raw';
+
 	/**
 	 * The value as returned by getWikitext() and getLongText().
 	 * @var string
@@ -271,6 +276,11 @@ public function getLongHTMLText( $linker = null ) {
 	}
 
 	public function getWikiValue() {
+
+		if ( $this->getOptionBy( self::VALUE_RAW ) ) {
+			return rawurldecode( $this->m_wikitext );
+		}
+
 		return $this->m_wikitext;
 	}
 

src/MediaWiki/Specials/SearchByProperty/PageRequestOptions.php

@@ -137,7 +137,7 @@ private function unescape( $value, $escaped ) {
 			$value = $escaped ? str_replace( array( '-20', '-2D' ), array( ' ', '-' ), $value ) : $value;
 			// Do not try to decode things like 1.2e-13
 			// Signals that we don't want any precision limitation
-			$this->value->setOption( 'no.displayprecision', true );
+			$this->value->setOption( NumberValue::NO_DISP_PRECISION_LIMIT, true );
 		} elseif ( $this->value instanceof TelephoneUriValue ) {
 			$value = $escaped ? str_replace( array( '-20', '-2D' ), array( ' ', '-' ), $value ) : $value;
 			// No encoding to avoid turning +1-201-555-0123

src/Query/Language/ValueDescription.php

@@ -6,6 +6,8 @@
 use SMw\DIProperty;
 use SMW\Query\QueryComparator;
 use SMWDataItem as DataItem;
+use SMWURIValue as UriValue;
+use SMWNumberValue as NumberValue;
 
 /**
  * Description of one data value, or of a range of data values.
@@ -100,11 +102,20 @@ public function getComparator() {
 	 * @return string
 	 */
 	public function getQueryString( $asValue = false ) {
-		$comparator = QueryComparator::getInstance()->getStringForComparator( $this->comparator );
-		$dataValue = DataValueFactory::getInstance()->newDataValueByItem( $this->dataItem, $this->property );
 
-		// Signals that we don't want any precision limitation
-		$dataValue->setOption( 'value.description', true );
+		$comparator = QueryComparator::getInstance()->getStringForComparator(
+			$this->comparator
+		);
+
+		$dataValue = DataValueFactory::getInstance()->newDataValueByItem(
+			$this->dataItem,
+			$this->property
+		);
+
+		// Set option to ensure that the output doesn't alter the display
+		// characteristics of a value
+		$dataValue->setOption( UriValue::VALUE_RAW, true );
+		$dataValue->setOption( NumberValue::NO_DISP_PRECISION_LIMIT, true );
 
 		if ( $asValue ) {
 			return $comparator . $dataValue->getWikiValue();