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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-10-29 06:13:00 -0700 (Wed, 29 Oct 2014)
New Revision: 9120

Modified:
   trunk/mapbender/http/php/mod_inspireDownloadFeed.php
Log:
Bugfix 3 for Testsuite

Modified: trunk/mapbender/http/php/mod_inspireDownloadFeed.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2014-10-29 13:05:57 UTC (rev 9119)
+++ trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2014-10-29 13:13:00 UTC (rev 9120)
@@ -1,5 +1,5 @@
 <?php
-//2012-06-15-http://localhost/mapbender/php/mod_inspireDownloadFeed.php?id=70e0c3e5-707c-f8e1-8037-7b38702176d9&type=SERVICE&generatefrom=all
+//2012-06-15-http://localhost/mapbender/php/mod_inspireDownloadFeed.php?id=70e0c3e5-707c-f8e1-8037-7b38702176d9&type=SERVICE&generateFrom=all
 //example: 2013-09-03 http://www.geoportal.rlp.de/mapbender/php/mod_inspireDownloadFeed.php?id=e9d22d13-e045-f0e0-25cc-1f146d681216&type=DATASET&generateFrom=wfs&wfsid=216&OPENSEARCH=true&spatial_dataset_identifier_code=e9d22d13-e045-f0e0-25cc-1f146d681216&spatial_dataset_identifier_namespace=http%3A%2F%2Fwww.geoportal.rlp.de&crs=EPSG:25832&language=de
 //20648
 // $Id: mod_inspireDownloadFeed.php 235
@@ -925,7 +925,7 @@
 
 	//self reference - 5.1.4 / 5.2
 	if ($type == 'SERVICE') {
-		$selfReference = $mapbenderServerUrl.$_SERVER['SCRIPT_NAME']."?id=".$recordId."&type=SERVICE&generatefrom=".$generateFrom;
+		$selfReference = $mapbenderServerUrl.$_SERVER['SCRIPT_NAME']."?id=".$recordId."&type=SERVICE&generateFrom=".$generateFrom;
 		switch($generateFrom) {
 			case "wmslayer":
 				$selfReference .= "&layerid=".$mapbenderMetadata[$m]->layer_id;
@@ -935,7 +935,7 @@
 			break;
 		}
 	} else { //DATASET
-		$selfReference = $mapbenderServerUrl.$_SERVER['SCRIPT_NAME']."?id=".$recordId."&type=DATASET&generatefrom=".$generateFrom;
+		$selfReference = $mapbenderServerUrl.$_SERVER['SCRIPT_NAME']."?id=".$recordId."&type=DATASET&generateFrom=".$generateFrom;
 		switch($generateFrom) {
 			case "wmslayer":
 				$selfReference .= "&layerid=".$mapbenderMetadata[$m]->layer_id;
@@ -1397,7 +1397,7 @@
 		//or link to dataset 5.2.3
 		//<link rel="alternate" href="http://xyz.org/data/abc/waternetwork_WGS84.shp" type="application/x-shp" hreflang="en" title="Water Network encoded as a ShapeFile in WGS84geographic coordinates (http://www.opengis.net/def/crs/OGC/1.3/CRS84)"/>
 			
-		$datasetFeedLink = $mapbenderServerUrl.$_SERVER['SCRIPT_NAME']."?id=".$recordId."&type=DATASET&generatefrom=".$mapbenderMetadata[$i]->origin;
+		$datasetFeedLink = $mapbenderServerUrl.$_SERVER['SCRIPT_NAME']."?id=".$recordId."&type=DATASET&generateFrom=".$mapbenderMetadata[$i]->origin;
 		switch($mapbenderMetadata[$i]->origin) {
 			case "wmslayer":
 				$datasetFeedLink .= "&layerid=".$mapbenderMetadata[$i]->layer_id;