[Mapbender-commits] r9697 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2017-02-22 06:04:51 -0800 (Wed, 22 Feb 2017)
New Revision: 9697

Modified:
   trunk/mapbender/http/php/mod_featuretypeISOMetadata.php
Log:
Fix for service version

Modified: trunk/mapbender/http/php/mod_featuretypeISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_featuretypeISOMetadata.php	2017-02-22 13:54:00 UTC (rev 9696)
+++ trunk/mapbender/http/php/mod_featuretypeISOMetadata.php	2017-02-22 14:04:51 UTC (rev 9697)
@@ -137,7 +137,8 @@
 	$t = array('i');
 	$res = db_prep_query($sql,$v,$t);
 	$mbMeta = db_fetch_array($res);
-
+        //add version to service url
+	
 	//infos about the registrating department, check first if a special metadata point of contact is defined in the service table - function from mod_showMetadata - TODO: should be defined in admin class
 	if (!isset($mbMeta['fkey_mb_group_id']) || is_null($mbMeta['fkey_mb_group_id']) || $mbMeta['fkey_mb_group_id'] == 0){
 		$e = new mb_notice("mod_featuretypeISOMetadata.php: fkey_mb_group_id not found!");
@@ -459,9 +460,9 @@
 	//Check if anonymous user has rights to access this featyretype - if not ? which resource should be advertised? TODO
     $url = '';
 	if ($hasPermission) {
-		$url = $mapbenderServiceUrl.$mbMeta['featuretype_id']."&REQUEST=GetCapabilities&SERVICE=WFS&VERSION=".$version;
+		$url = $mapbenderServiceUrl.$mbMeta['featuretype_id']."&REQUEST=GetCapabilities&SERVICE=WFS&VERSION=".$mbMeta['wfs_version'];
 	} else {
-		$url = "https://".$_SERVER['HTTP_HOST']."/registry/wfs/".$mbMeta['featuretype_id']."?REQUEST=GetCapabilities&SERVICE=WFS&VERSION=".$version;
+		$url = "https://".$_SERVER['HTTP_HOST']."/registry/wfs/".$mbMeta['featuretype_id']."?REQUEST=GetCapabilities&SERVICE=WFS&VERSION=".$mbMeta['wfs_version'];
 	}
     $xmlBuilder->addValue($MD_Metadata,
             './gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL',