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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-02-10 03:34:02 -0800 (Mon, 10 Feb 2014)
New Revision: 8774

Modified:
   trunk/mapbender/http/php/mod_exportISOMetadata.php
   trunk/mapbender/http/php/mod_showMetadata.php
   trunk/mapbender/http/php/wms.php
Log:
Some little bugfixes and possibility to export metadata based inspire dls to iso19139 xml.

Modified: trunk/mapbender/http/php/mod_exportISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_exportISOMetadata.php	2014-02-07 12:53:34 UTC (rev 8773)
+++ trunk/mapbender/http/php/mod_exportISOMetadata.php	2014-02-10 11:34:02 UTC (rev 8774)
@@ -153,6 +153,14 @@
 						$dlsOption = $option->type;						
 						$dlsOptionId = $option->serviceId;
 						break;
+					case "downloadlink":
+						$generatorDlsUrl = $generatorBaseUrlDls."Id=".$row_metadata["uuid"]."&outputFormat=iso19139&generateFrom=metadata";
+						$dlsOption = $option->type;
+						//generate downloadservice uuid from metadata_uuid and hash of link 		
+						$mdPart = explode('-',$row_metadata["uuid"]);
+						$linkPart = md5($option->link);
+						$dlsOptionId = $mdPart[0]."-".$mdPart[1]."-".$mdPart[2]."-".substr($linkPart, -12, 4)."-".substr($linkPart, -8, 8);
+						break;
 				}
 				echo "<br>".$generatorDlsUrl."<br>";
 				//load the xml and store it to filesystem

Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php	2014-02-07 12:53:34 UTC (rev 8773)
+++ trunk/mapbender/http/php/mod_showMetadata.php	2014-02-10 11:34:02 UTC (rev 8774)
@@ -916,7 +916,7 @@
 
 
 if ($layerAccessibility && WRAPPER_PATH != '' && ($resource == 'layer' or $resource == 'wms' )) {
-	$showMapUrl = $mapbenderBaseUrl.WRAPPER_PATH."?LAYER[zoom]=1&LAYER[id]=".$resourceMetadata['contentid']."&LAYER[visible]=0&LAYER[queryable]=0";
+	$showMapUrl = $mapbenderBaseUrl.WRAPPER_PATH."?LAYER[zoom]=1&LAYER[id]=".$resourceMetadata['contentid']."&LAYER[visible]=0&LAYER[querylayer]=0";
 	//$html .= $t_a.$translation['addLayerToMap'].$t_b."<a href='".$showMapUrl."' target='_blank'><img src='../img/osgeo_graphics/layer-wms-add.png'></a>".$t_c;
 	$html .= $t_a."<button onclick='window.open(\"".$showMapUrl."\", 
   \"windowname1\", 

Modified: trunk/mapbender/http/php/wms.php
===================================================================
--- trunk/mapbender/http/php/wms.php	2014-02-07 12:53:34 UTC (rev 8773)
+++ trunk/mapbender/http/php/wms.php	2014-02-10 11:34:02 UTC (rev 8774)
@@ -960,7 +960,7 @@
 //call function for sublayer element
 
 //*************************************************
-function createLayerElement ($doc, $wmsId, $layerRow, $wmsRow, $AuthorityName) {
+function createLayerElement ($doc, $wmsId, $layerRow, $wmsRow, $AuthorityName, $mapbenderMetadataUrlUrl) {
 	#Creating single layer node
 	$layer = $doc->createElement("Layer");
     	if($layerRow['layer_queryable'] <> "" AND $layerRow['layer_queryable'] <> NULL) {
@@ -1275,7 +1275,7 @@
 
 //*************************************************
 
-function createLayerTree($parent, $withChilds, $layerId, &$layer, $wmsId, $doc, $wms_row) {
+function createLayerTree($parent, $withChilds, $layerId, &$layer, $wmsId, $doc, $wms_row, $mapbenderMetadataUrlUrl) {
 	$sub_layer_sql = "SELECT * FROM layer WHERE fkey_wms_id = $1 AND layer_parent = $2 ORDER BY layer_pos";
 	$v = array($wmsId, $parent);
 	$t = array("i","s");
@@ -1287,9 +1287,9 @@
 	//$e = new mb_exception($sub_layer_sql);
 	$res_sub_layer_sql = db_prep_query($sub_layer_sql, $v, $t);
 	while ($sub_layer_row = db_fetch_array($res_sub_layer_sql)) {
-		$subLayer = createLayerElement($doc, $wmsId, $sub_layer_row, $wms_row, $AuthorityName);
+		$subLayer = createLayerElement($doc, $wmsId, $sub_layer_row, $wms_row, $AuthorityName, $mapbenderMetadataUrlUrl);
 		//recursive creation
-		createLayerTree($sub_layer_row['layer_pos'], $withChilds, $layerId, $subLayer, $wmsId, $doc, $wms_row);
+		createLayerTree($sub_layer_row['layer_pos'], $withChilds, $layerId, $subLayer, $wmsId, $doc, $wms_row, $mapbenderMetadataUrlUrl);
 		$layer->appendChild($subLayer);
 	}
 }
@@ -1304,12 +1304,12 @@
 //TODO: root layer is always there but the following pulls only the sublayer and not the requested layer by its own!! - todo: don't use the root layer every time!!! pull the requested layer instead but pull all srs and things which are inherited from the root layer or the parents from this layer - it is not always easy if the hirarchy is nested much - pull all parents - maybe a thing for class_administration!
 if ($withChilds) {
 	//create layer itself first!
-	$subLayer = createLayerElement($doc, $wmsId, $row, $wms_row, $AuthorityName);
+	$subLayer = createLayerElement($doc, $wmsId, $row, $wms_row, $AuthorityName, $mapbenderMetadataUrlUrl);
 	
-	createLayerTree($layerPos, $withChilds, $layerId, $subLayer, $wms_row['wms_id'], $doc, $wms_row);
+	createLayerTree($layerPos, $withChilds, $layerId, $subLayer, $wms_row['wms_id'], $doc, $wms_row, $mapbenderMetadataUrlUrl);
 } else {
 	//only create one layer
-	$subLayer = createLayerElement($doc, $wmsId, $row, $wms_row, $AuthorityName);
+	$subLayer = createLayerElement($doc, $wmsId, $row, $wms_row, $AuthorityName, $mapbenderMetadataUrlUrl);
 }
 $layer->appendChild($subLayer);
 header("Content-type: application/xhtml+xml; charset=UTF-8");