[Mapbender-commits] r10129 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-05-21 01:15:54 -0700 (Tue, 21 May 2019)
New Revision: 10129

Modified:
   trunk/mapbender/http/classes/class_metadata.php
Log:
Fix for showing right protocol (optinal https) in coupledResource metadata search result

Modified: trunk/mapbender/http/classes/class_metadata.php
===================================================================
--- trunk/mapbender/http/classes/class_metadata.php	2019-05-20 13:08:24 UTC (rev 10128)
+++ trunk/mapbender/http/classes/class_metadata.php	2019-05-21 08:15:54 UTC (rev 10129)
@@ -63,7 +63,6 @@
 	var $resolveCoupledResources; //only for class of dataset metadata - it pulls the coupled ressources (ogc-services : wms-layer/wfs-featuretypes)
 	var $https;
 	var $protocol;
-
 	function __construct($userId, $searchId, $searchText, $registratingDepartments, $isoCategories, $inspireThemes, $timeBegin, $timeEnd, $regTimeBegin, $regTimeEnd, $maxResults, $searchBbox, $searchTypeBbox, $accessRestrictions, $languageCode, $searchEPSG, $searchResources, $searchPages, $outputFormat, $resultTarget, $searchURL, $customCategories, $hostName, $orderBy, $resourceIds, $restrictToOpenData, $originFromHeader, $resolveCoupledResources = false, $https = false){
 		$this->userId = (integer)$userId;
 		$this->searchId = $searchId;
@@ -677,7 +676,7 @@
 			$countUniqueFeaturetypes = count($uniqueAllCoupledFeaturetypes);
 			if ($countUniqueLayers >= 1) {
 				//$e = new mb_exception("invoke search");
-				$coupledLayers = new self($this->userId, 'dummysearch', '*', null, null, null, null, null, null, null, $countUniqueLayers, null, null, null, $this->languageCode, null, 'wms', 1, 'json', 'internal', null, null, $this->hostName, 'rank',implode(',',$uniqueAllCoupledLayers) ,false , null);
+				$coupledLayers = new self($this->userId, 'dummysearch', '*', null, null, null, null, null, null, null, $countUniqueLayers, null, null, null, $this->languageCode, null, 'wms', 1, 'json', 'internal', null, null, $this->hostName, $this->orderBy, implode(',',$uniqueAllCoupledLayers), $this->restrictToOpenData, $this->originFromHeader, false, $this->https);
 				$srvCount = 0;				
 				foreach (json_decode($coupledLayers->internalResult)->wms->srv as $server) {			
 					//$e = new mb_exception("server id ->". $server->id);
@@ -707,7 +706,7 @@
 			//$e = new mb_exception("count featuretypes: ".time());
 			if ($countUniqueFeaturetypes >= 1) {
 				//$e = new mb_exception("some ft found");
-				$coupledFeaturetypes = new self($this->userId, 'dummysearch', '*', null, null, null, null, null, null, null, $countUniqueFeaturetypes, null, null, null, $this->languageCode, null, 'wfs', 1, 'json', 'internal', null, null, $this->hostName, 'rank', implode(',',$uniqueAllCoupledFeaturetypes),false , null);
+				$coupledFeaturetypes = new self($this->userId, 'dummysearch', '*', null, null, null, null, null, null, null, $countUniqueFeaturetypes, null, null, null, $this->languageCode, null, 'wfs', 1, 'json', 'internal', null, null, $this->hostName, $this->orderBy, implode(',',$uniqueAllCoupledFeaturetypes), $this->restrictToOpenData, $this->originFromHeader, false, $this->https);
 				//$e = new mb_exception("featuretype: ".$coupledFeaturetypes->internalResult);	
 				$srvCount = 0;				
 				foreach (json_decode($coupledFeaturetypes->internalResult)->wfs->srv as $server) {