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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-01-04 09:17:02 -0800 (Tue, 04 Jan 2011)
New Revision: 7419

Modified:
   trunk/mapbender/http/php/mod_layerISOMetadata.php
Log:
Bugfixes for export iso19139

Modified: trunk/mapbender/http/php/mod_layerISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_layerISOMetadata.php	2011-01-04 14:51:18 UTC (rev 7418)
+++ trunk/mapbender/http/php/mod_layerISOMetadata.php	2011-01-04 17:17:02 UTC (rev 7419)
@@ -647,7 +647,7 @@
 
 #to the things which have to be done for integrating the service into a client like portalu ... they have defined another location to put the GetCap URL than INSPIRE does it
 
-	$containsOperation=$iso19139->createElement("srv:containsOperation");
+	$containsOperation=$iso19139->createElement("srv:containsOperations");
 	$SV_OperationMetadata=$iso19139->createElement("srv:SV_OperationMetadata");
 
 
@@ -686,29 +686,22 @@
 	$gmd_linkage->appendChild($gmd_URL);
 	$CI_OnlineResource->appendChild($gmd_linkage);
 	$connectPoint->appendChild($CI_OnlineResource);
-//connectPoint END *****************************
 
+	$SV_OperationMetadata->appendChild($operationName);
+	$SV_OperationMetadata->appendChild($DCP);
+	$SV_OperationMetadata->appendChild($connectPoint);
 
+	$containsOperation->appendChild($SV_OperationMetadata);
 
-$SV_OperationMetadata->appendChild($operationName);
-$SV_OperationMetadata->appendChild($DCP);
-$SV_OperationMetadata->appendChild($connectPoint);
-
-$SV_ServiceIdentification->appendChild($SV_OperationMetadata);
+	$SV_ServiceIdentification->appendChild($containsOperation);
 	
-
 /*
-
 	$serviceTypeVersion_cs->appendChild($serviceTypeVersionText);
 	$serviceTypeVersion->appendChild($serviceTypeVersion_cs);
 	$SV_ServiceIdentification->appendChild($serviceTypeVersion);
 */
-
-
-	
 	$identificationInfo->appendChild($SV_ServiceIdentification);
-	
-	//distributionInfo
+//distributionInfo
 	$gmd_distributionInfo=$iso19139->createElement("gmd:distributionInfo");
 	$MD_Distribution=$iso19139->createElement("gmd:MD_Distribution");
 	$gmd_distributionFormat=$iso19139->createElement("gmd:distributionFormat");
@@ -727,10 +720,10 @@
 	$gmd_URL=$iso19139->createElement("gmd:URL");
 	//Check if anonymous user has rights to access this layer - if not ? which resource should be advertised? TODO
 	if ($hasPermission) {
-		$gmd_URLText=$iso19139->createTextNode("http://www.geoportal.rlp.de/mapbender/php/wms.php?layer_id=".$mapbenderMetadata['layer_id']."");
+		$gmd_URLText=$iso19139->createTextNode("http://".$_SERVER['HTTP_HOST']."/mapbender/php/wms.php?layer_id=".$mapbenderMetadata['layer_id']."");
 	}
 	else {
-		$gmd_URLText=$iso19139->createTextNode("https://www.geoportal.rlp.de/http_auth/".$mapbenderMetadata['layer_id']."?");
+		$gmd_URLText=$iso19139->createTextNode("https://".$_SERVER['HTTP_HOST']."/http_auth/".$mapbenderMetadata['layer_id']."?");
 	}
 	$gmd_URL->appendChild($gmd_URLText);
 	$gmd_linkage->appendChild($gmd_URL);