[Mapbender-commits] r8271 - in trunk/mapbender/http: geoportal php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2012-02-28 23:50:45 -0800 (Tue, 28 Feb 2012)
New Revision: 8271

Modified:
   trunk/mapbender/http/geoportal/mod_readCSWResults.php
   trunk/mapbender/http/php/mod_layerISOMetadata.php
Log:
Bugfixes

Modified: trunk/mapbender/http/geoportal/mod_readCSWResults.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_readCSWResults.php	2012-02-29 07:31:23 UTC (rev 8270)
+++ trunk/mapbender/http/geoportal/mod_readCSWResults.php	2012-02-29 07:50:45 UTC (rev 8271)
@@ -727,14 +727,14 @@
 				} else {#add empty tags
 					fwrite($os_catalogs_file_handle,"<wmsaccessUrl></wmsaccessUrl>\n<mbaddurl></mbaddurl>\n");				
 				}
-				if ($typeOfRecord =='application' || $typeOfRecord =='dataset'){
+				//if ($typeOfRecord =='application' || $typeOfRecord =='dataset'){
 					fwrite($os_catalogs_file_handle,"<accessUrl>");
 					fwrite($os_catalogs_file_handle, urlencode($accessUrl));
 					fwrite($os_catalogs_file_handle,"</accessUrl>\n");
-				} else {
+				/*} else {
 					fwrite($os_catalogs_file_handle,"<accessUrl>");
 					fwrite($os_catalogs_file_handle,"</accessUrl>\n");
-				}
+				}*/
 				if (isset($graphicURL) && $graphicURL != '' && isValidURL($graphicURL)){
 					fwrite($os_catalogs_file_handle,"<graphicUrl>");
 					fwrite($os_catalogs_file_handle, urlencode($graphicURL));

Modified: trunk/mapbender/http/php/mod_layerISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_layerISOMetadata.php	2012-02-29 07:31:23 UTC (rev 8270)
+++ trunk/mapbender/http/php/mod_layerISOMetadata.php	2012-02-29 07:50:45 UTC (rev 8271)
@@ -716,7 +716,8 @@
 		$gmd_URLText=$iso19139->createTextNode("http://".$_SERVER['HTTP_HOST']."/mapbender/php/wms.php?inspire=1&layer_id=".$mapbenderMetadata['layer_id']."&REQUEST=GetCapabilities&SERVICE=WMS");
 	}
 	else {
-		$gmd_URLText=$iso19139->createTextNode("https://".$_SERVER['HTTP_HOST']."/http_auth/".$mapbenderMetadata['layer_id']."?REQUEST=GetCapabilities&SERVICE=WMS");
+		$serverWithOutPort80 = str_replace(":80","",$_SERVER['HTTP_HOST']);//fix problem when metadata is generated thru curl invocations
+		$gmd_URLText=$iso19139->createTextNode("https://".$serverWithOutPort80."/http_auth/".$mapbenderMetadata['layer_id']."?REQUEST=GetCapabilities&SERVICE=WMS");
 	}
 	$gmd_URL->appendChild($gmd_URLText);
 	$gmd_linkage->appendChild($gmd_URL);