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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2013-02-24 03:57:48 -0800 (Sun, 24 Feb 2013)
New Revision: 8571

Modified:
   trunk/mapbender/http/php/mod_exportMapbenderLayer2CkanObjects.php
Log:
Don't use absolut urls for export2ckan  api

Modified: trunk/mapbender/http/php/mod_exportMapbenderLayer2CkanObjects.php
===================================================================
--- trunk/mapbender/http/php/mod_exportMapbenderLayer2CkanObjects.php	2013-02-24 11:34:34 UTC (rev 8570)
+++ trunk/mapbender/http/php/mod_exportMapbenderLayer2CkanObjects.php	2013-02-24 11:57:48 UTC (rev 8571)
@@ -100,6 +100,17 @@
 //build json objects!
 
 function buildCkanPackage ($mbArray) {
+	//use urls from mapbender.conf if available!
+	if (defined("MAPBENDER_PATH") && MAPBENDER_PATH != '') {
+		$mapbenderUrl = MAPBENDER_PATH;
+	} else {
+		$mapbenderUrl = "http://".$_SERVER['HTTP_HOST']."/mapbender";
+	}
+	if (defined("WRAPPER_PATH") && WRAPPER_PATH != '') {
+		$wrapperUrl = "http://".$_SERVER['HTTP_HOST'].WRAPPER_PATH;
+	} else {
+		$wrapperUrl = "http://".$_SERVER['HTTP_HOST']."/portal/karten.html";
+	}
 	//example package and mapping
 	$package->maintainer = $mbArray['group_title']; //mb_group.mb_group_name
 	$package->point_of_contact = $mbArray['group_title'];//"Andreas Becker"; //mb_user.mb_user_name - owner
@@ -107,7 +118,7 @@
 	$package->point_of_contact_email = $mbArray['group_email'];//"poststelle at lvermgeo.rlp"; //mb_group.mb_group_email
 	$package->license = $mbArray['tou_licence_title'];//"Datenlizenz Deutschland – Namensnennung – nicht kommerziell"; // termsofuse.description
 	$package->author = $mbArray['mb_user_id'];//""; //mb_group.mb_group_name
-	$package->download_url = "http://www.geoportal.rlp.de/mapbender/php/wms.php?layer_id=".$mbArray['resource_id']."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS";//$mbArray['mb_user_id'];//"http://www.geoportal.rlp.de/portal/karten.html?LAYER[zoom]=1&LAYER[id]=36699"; //
+	$package->download_url = $mapbenderUrl."/php/wms.php?layer_id=".$mbArray['resource_id']."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS";//$mbArray['mb_user_id'];//"http://www.geoportal.rlp.de/portal/karten.html?LAYER[zoom]=1&LAYER[id]=36699"; //
 	$package->version = "";//$mbArray['mb_user_id'];//""; //		
 	$package->groups = array();
 	//for v1/v2 - only $package->groups[0] = "gdi-rp"; //constant
@@ -141,17 +152,17 @@
 
 	$package->resources[0]->description = "Anzeige im GeoPortal.rlp";//$mbArray['mb_user_id'];// "Link zur WMS-Darstellung im GeoPortal.rlp, die Darstellung erfolgt ab einem Maßstab 1:500.000"; //fix: "".id.id?
 	$package->resources[0]->format = "Kartenviewer"; //constant
-	$package->resources[0]->url = "http://www.geoportal.rlp.de/portal/karten.html?LAYER[zoom]=1&LAYER[id]=".$mbArray['resource_id'];// "http://www.geoportal.rlp.de/portal/karten.html?LAYER[zoom]=1&LAYER[id]=36699"; //constant .. ids
+	$package->resources[0]->url = $wrapperUrl."?LAYER[zoom]=1&LAYER[id]=".$mbArray['resource_id'];// "http://www.geoportal.rlp.de/portal/karten.html?LAYER[zoom]=1&LAYER[id]=36699"; //constant .. ids
 	$package->resources[0]->resource_type = "visualization"; //constant
 
 	$package->resources[1]->description = "WMS Capabilities Link zur Integration in GIS oder Webapplikationen";//$mbArray['mb_user_id'];// "Link zur WMS-Darstellung im GeoPortal.rlp, die Darstellung erfolgt ab einem Maßstab 1:500.000"; //fix: "".id.id?
 	$package->resources[1]->format = "WMS"; //constant
-	$package->resources[1]->url = "http://www.geoportal.rlp.de/mapbender/php/wms.php?layer_id=".$mbArray['resource_id']."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS";// "http://www.geoportal.rlp.de/portal/karten.html?LAYER[zoom]=1&LAYER[id]=36699"; //constant .. ids
+	$package->resources[1]->url = $mapbenderUrl."/php/wms.php?layer_id=".$mbArray['resource_id']."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS";// "http://www.geoportal.rlp.de/portal/karten.html?LAYER[zoom]=1&LAYER[id]=36699"; //constant .. ids
 	$package->resources[1]->resource_type = "visualization"; //constant
 
 	$package->resources[2]->description = "Metadaten zur WMS Kartenebene";//$mbArray['mb_user_id'];// "Link zur WMS-Darstellung im GeoPortal.rlp, die Darstellung erfolgt ab einem Maßstab 1:500.000"; //fix: "".id.id?
 	$package->resources[2]->format = "html"; //constant
-	$package->resources[2]->url = "http://www.geoportal.rlp.de/mapbender/php/mod_showMetadata.php?languageCode=de&resource=layer&layout=tabs&id=".$mbArray['resource_id'];// "http://www.geoportal.rlp.de/portal/karten.html?LAYER[zoom]=1&LAYER[id]=36699"; //constant .. ids
+	$package->resources[2]->url = $mapbenderUrl."/php/mod_showMetadata.php?languageCode=de&resource=layer&layout=tabs&id=".$mbArray['resource_id'];// "http://www.geoportal.rlp.de/portal/karten.html?LAYER[zoom]=1&LAYER[id]=36699"; //constant .. ids
 	$package->resources[2]->resource_type = "metadata"; //constant
 
 	$package->author_address->url = $mbArray['mb_user_id'];// null; //null