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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-07-29 04:09:27 -0700 (Tue, 29 Jul 2014)
New Revision: 9008

Modified:
   trunk/mapbender/http/php/mod_inspireDownloadFeed.php
Log:
Solve problem with arcgis wfs with no trailing questionmark in POST when creating INSPIRE ATOM Feeds

Modified: trunk/mapbender/http/php/mod_inspireDownloadFeed.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2014-07-29 10:22:32 UTC (rev 9007)
+++ trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2014-07-29 11:09:27 UTC (rev 9008)
@@ -1161,6 +1161,7 @@
 				return "<error>Version of WFS : ".$mapbenderMetadata[$i]->wfs_version." is not supported to generate inspire download services for predefined datasets!</error>";
 			}
 				//define request to get number of hits per featuretype
+				//add ? if not given in string
 				$gHLink = $mapbenderMetadata[$i]->wfs_getfeature."SERVICE=WFS&REQUEST=GetFeature&VERSION=";
 				$gHLink .= $mapbenderMetadata[$i]->wfs_version."&typeName=";
 				$gHLink .= $mapbenderMetadata[$i]->featuretype_name."&resultType=hits";
@@ -1705,7 +1706,7 @@
 
 function fillMapbenderMetadata($dbResult, $generateFrom) {
 	//function increments $indexMapbenderMetadata !!!
-	global $mapbenderMetadata, $indexMapbenderMetadata;
+	global $mapbenderMetadata, $indexMapbenderMetadata, $admin;
 	//echo "<error>fill begins</error>";
 	if ($generateFrom == 'metadata') {
 		$row = db_fetch_assoc($dbResult);
@@ -1796,7 +1797,7 @@
 				$mapbenderMetadata[$indexMapbenderMetadata]->wfs_title = $row['wfs_title'];
 				$mapbenderMetadata[$indexMapbenderMetadata]->wfs_id = $row['wfs_id'];
 				$mapbenderMetadata[$indexMapbenderMetadata]->wfs_abstract = $row['wfs_abstract'];
-				$mapbenderMetadata[$indexMapbenderMetadata]->wfs_getfeature = $row['wfs_getfeature'];
+				$mapbenderMetadata[$indexMapbenderMetadata]->wfs_getfeature = $admin->checkUrl($row['wfs_getfeature']);
 				$mapbenderMetadata[$indexMapbenderMetadata]->wfs_getcapabilities = $row['wfs_getcapabilities'];
 				$mapbenderMetadata[$indexMapbenderMetadata]->wfs_version = $row['wfs_version'];
 				$mapbenderMetadata[$indexMapbenderMetadata]->wfs_max_features = $row['wfs_max_features'];