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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-03-22 06:30:09 -0700 (Tue, 22 Mar 2011)
New Revision: 7716

Modified:
   trunk/mapbender/http/php/mod_getServiceDisclaimer.php
   trunk/mapbender/http/php/mod_layerISOMetadata.php
   trunk/mapbender/http/php/mod_wmc2ol.php
Log:
Bugfixes:

Modified: trunk/mapbender/http/php/mod_getServiceDisclaimer.php
===================================================================
--- trunk/mapbender/http/php/mod_getServiceDisclaimer.php	2011-03-22 07:52:28 UTC (rev 7715)
+++ trunk/mapbender/http/php/mod_getServiceDisclaimer.php	2011-03-22 13:30:09 UTC (rev 7716)
@@ -178,7 +178,7 @@
 	$sql .= " (wms_termsofuse.fkey_termsofuse_id=termsofuse.termsofuse_id) where wms.wms_id = $1";
 }
 if ($type == "wfs") {
-	$sql = "SELECT wms_id, accessconstraints, fees, wfs_network_access , termsofuse.name,";
+	$sql = "SELECT wfs_id, accessconstraints, fees, wfs_network_access , termsofuse.name,";
 	$sql .= " termsofuse.termsofuse_id ,termsofuse.symbollink, termsofuse.description,termsofuse.descriptionlink from wfs LEFT OUTER JOIN";
 	$sql .= "  wfs_termsofuse ON  (wfs.wfs_id = wfs_termsofuse.fkey_wfs_id) LEFT OUTER JOIN termsofuse ON";
 	$sql .= " (wfs_termsofuse.fkey_termsofuse_id=termsofuse.termsofuse_id) where wfs.wfs_id = $1";	

Modified: trunk/mapbender/http/php/mod_layerISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_layerISOMetadata.php	2011-03-22 07:52:28 UTC (rev 7715)
+++ trunk/mapbender/http/php/mod_layerISOMetadata.php	2011-03-22 13:30:09 UTC (rev 7716)
@@ -75,7 +75,7 @@
 	else {
 	//next function is for normal mapbender installations and read the info directly from the wms and layer tables
 		$sql = "SELECT ";
-		$sql .= "layer.layer_id,layer.layer_name, layer.layer_title, layer.layer_abstract, layer.layer_pos, layer.layer_parent, layer.layer_minscale, layer.layer_maxscale, ";
+		$sql .= "layer.layer_id,layer.layer_name, layer.layer_title, layer.layer_abstract, layer.layer_pos, layer.layer_parent, layer.layer_minscale, layer.layer_maxscale, layer.uuid,";
 		$sql .= "wms.wms_title, wms.wms_abstract, wms.wms_id, wms.fees, wms.accessconstraints, wms.contactperson, ";
 		$sql .= "wms.contactposition, wms.contactorganization, wms.address, wms.city, wms_timestamp, wms_owner, ";
 		$sql .= "wms.stateorprovince, wms.postcode, wms.contactvoicetelephone, wms.contactfacsimiletelephone, wms.wms_owsproxy,";
@@ -139,8 +139,8 @@
 	//generate identifier part 
 	$identifier = $iso19139->createElement("gmd:fileIdentifier");
 	$identifierString = $iso19139->createElement("gco:CharacterString");
-	if (isset($mapbenderMetadata['layer_id'])) {
-		$identifierText = $iso19139->createTextNode($mapbenderMetadata['layer_id']);//TODO: generate an uuid?
+	if (isset($mapbenderMetadata['uuid'])) {
+		$identifierText = $iso19139->createTextNode($mapbenderMetadata['uuid']);//TODO: generate an uuid?
 	}
 	else {
 		$identifierText = $iso19139->createTextNode("no id found");

Modified: trunk/mapbender/http/php/mod_wmc2ol.php
===================================================================
--- trunk/mapbender/http/php/mod_wmc2ol.php	2011-03-22 07:52:28 UTC (rev 7715)
+++ trunk/mapbender/http/php/mod_wmc2ol.php	2011-03-22 13:30:09 UTC (rev 7716)
@@ -176,12 +176,12 @@
 	if(isset($_REQUEST["withDigitize"]) or isset($_REQUEST["GEORSS"])){
 		if(($_REQUEST["withDigitize"]=='1') or ($_REQUEST["GEORSS"]!='')){
 			#$html.="<script src='http://".$_SERVER['HTTP_HOST']."/mapbender/extensions/OpenLayers-2.8/OpenLayers.js'></script>\n";
-			$html.="<script src='../extensions/OpenLayers-2.8/OpenLayers.js'></script>\n";
+			$html.="<script src='../extensions/OpenLayers-2.9.1/OpenLayers.js'></script>\n";
 		}
 	} else {
 		//use the minimized version
 		//$html.="<script src='../../openlayers/build/geoportal_ol_geoportal.js'></script>\n";
-		$html.="<script src='../extensions/OpenLayers-2.8/OpenLayers.js'></script>\n"; //TODO minimize this or use other lib
+		$html.="<script src='../extensions/OpenLayers-2.9.1/OpenLayers.js'></script>\n"; //TODO minimize this or use other lib
 	}
 	//begin part for javascript code
 	$html.="<script type='text/javascript'>\n";
@@ -545,7 +545,7 @@
 	//end of click function for digitizing	
 
 	$html.="}\n";//End of central function initGeoportal()
-
+//\"<div class='georsstitle'>\" + feature.attributes['title'] +\"</div><br/>\"+\"<div class='georssdescription'>\" +feature.attributes['description']+\"</div><br/><div class='georsslink'><a href='\"+feature.attributes['link']+\"' target='_blank'>Weitere Informationen</a></div>\",
 	//functions only needed, if georss objects are given - for generating popups - after initGeoportal()!
 	if(isset($_REQUEST["GEORSS"])){
 		if($_REQUEST["GEORSS"]!=''){	
@@ -558,7 +558,7 @@
 			$html.="	popup = new OpenLayers.Popup.FramedCloud(\"chicken\", \n";
 			$html.="	feature.geometry.getBounds().getCenterLonLat(),
 					null,
-					\"<div class='georsstitle'>\" + feature.attributes['title'] +\"</div><br/>\"+\"<div class='georssdescription'>\" +feature.attributes['description']+\"</div><br/><div class='georsslink'><a href='\"+feature.attributes['link']+\"' target='_blank'>Weitere Informationen</a></div>\",
+					'<div class=\"georsstitle\">' + feature.attributes['title'] +'</div><br/>'+'<div class=\"georssdescription\">' +feature.attributes['description']+'</div><br/><div class=\"georsslink\"><a href=\"'+feature.attributes['link']+'\" target=\"_blank\">Weitere Informationen</a></div>',
 					null, true, onPopupClose);\n";
 			$html.="	feature.popup = popup;\n";
 			$html.="	map.addPopup(popup);\n";