[Mapbender-commits] r6847 - in trunk/mapbender/http: img php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2010-08-31 07:15:19 +0000 (Tue, 31 Aug 2010)
New Revision: 6847

Added:
   trunk/mapbender/http/img/inspire_tr_36.png
Modified:
   trunk/mapbender/http/php/mod_layerMetadata.php
Log:
Merge Geoportal.rlp - show mapbender capabilities, show inspire service metadata, validate inspire service metadata with INSPIRE validator.

Added: trunk/mapbender/http/img/inspire_tr_36.png
===================================================================
(Binary files differ)


Property changes on: trunk/mapbender/http/img/inspire_tr_36.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/mapbender/http/php/mod_layerMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_layerMetadata.php	2010-08-31 06:41:29 UTC (rev 6846)
+++ trunk/mapbender/http/php/mod_layerMetadata.php	2010-08-31 07:15:19 UTC (rev 6847)
@@ -169,7 +169,6 @@
 		{$layer['Maxscale'] = "-";}
 	}
 	$layer['Koordinatensysteme'] = preg_replace("/ /", ", ", getEpsgByLayerId($row['layer_id']));
-//	$layer['Capabilities-Dokument'] = "<a href = '../x_geoportal/getCapabilities_document.php?wms_request=".$row['wms_id']."&layer_request=".$row['layer_pos']."' target=_blank>Capabilities-Dokument</a>";
 	if ($row['wms_timestamp']) {
 		$layer['Datum der Registrierung'] = date("d.m.Y",$row['wms_timestamp']); 
 	}
@@ -178,6 +177,8 @@
 	}
 	$layer['Registrierende Stelle'] = $row_dep['mb_group_name'];
 	$layer['WMS ID'] = $row['wms_id'];
+	$layer['Mapbender Capabilities Dokument'] = "<a href = '../php/wms.php?layer_id=".$layer_id."&PHPSESSID=".session_id()."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS' target=_blank>Capabilities-Dokument</a>";
+	$layer['Service Metadaten'] = "<a href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=".	$layer_id."' target=_blank ><img src='../img/inspire_tr_36.png' title='INSPIRE Metadaten' style='width:34px;height:34px' alt='' /></a>"."<a href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=".$layer_id."&validate=true' target=_blank title='Validierung gegen INSPIRE Geoportal'>Validierung</a>";
 	$layer['WMS Titel'] = $row['wms_title'];
 	$layer['WMS Zusammenfassung'] = $row['wms_abstract'];
 	$layer['Geb&uuml;hren'] = $row['fees'];
@@ -235,13 +236,13 @@
     $resdir = TMPDIR;
     $kml_id=md5(uniqid(rand(), true));
     //dbselect for generate KML	
-    $sql_kml = "select wms.wms_getmap, wms.wms_version, layer.layer_name,layer.layer_title, layer_epsg.minx,layer_epsg.miny,layer_epsg.maxx,layer_epsg.maxy from wms, layer, layer_epsg, wms_format where layer.layer_id=$1 and layer.fkey_wms_id=wms.wms_id and layer.layer_id=layer_epsg.fkey_layer_id and layer_epsg.epsg='EPSG:4326' and wms.wms_id=wms_format.fkey_wms_id and wms_format.data_format like '%image/png%' LIMIT 1";
+    $sql_kml = "select wms.wms_getmap, wms.wms_version, layer.layer_name,layer.layer_title, layer_epsg.minx,layer_epsg.miny,layer_epsg.maxx,layer_epsg.maxy from wms, layer, layer_epsg, wms_format where layer.layer_id=$1 and layer.fkey_wms_id=wms.wms_id and layer.layer_id=layer_epsg.fkey_layer_id and layer_epsg.epsg='EPSG:4326' and wms.wms_id=wms_format.fkey_wms_id and wms_format.data_format like '%image/png%' LIMIT 1";
 
-	$v_kml = array($layer_id);
+	$v_kml = array($layer_id);
 
-	$t_kml = array('i');
+	$t_kml = array('i');
 
-	$res_kml = db_prep_query($sql_kml, $v_kml, $t_kml);
+	$res_kml = db_prep_query($sql_kml, $v_kml, $t_kml);
 
 	$row_kml = db_fetch_array($res_kml);