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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-06-09 02:14:11 -0700 (Thu, 09 Jun 2016)
New Revision: 9514

Modified:
   trunk/mapbender/http/php/mod_callMetadata.php
   trunk/mapbender/http/php/mod_dataISOMetadata.php
Log:
Handle preview url for dataset metadata export, set default max results per page in mapbender.conf

Modified: trunk/mapbender/http/php/mod_callMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_callMetadata.php	2016-06-09 09:12:23 UTC (rev 9513)
+++ trunk/mapbender/http/php/mod_callMetadata.php	2016-06-09 09:14:11 UTC (rev 9514)
@@ -31,7 +31,11 @@
 $timeEnd = NULL;
 $regTimeBegin = NULL;
 $regTimeEnd = NULL;
-$maxResults = 20;
+if (defined('DEFAULT_MAX_RESULTS_PER_PAGE')){
+	$maxResults = DEFAULT_MAX_RESULTS_PER_PAGE;
+} else {
+	$maxResults = 10;
+}
 #$searchBbox = "-180.0,-90.0,180.0,90.0";
 $searchBbox = NULL;
 $searchTypeBbox = "intersects"; //outside / inside

Modified: trunk/mapbender/http/php/mod_dataISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_dataISOMetadata.php	2016-06-09 09:12:23 UTC (rev 9513)
+++ trunk/mapbender/http/php/mod_dataISOMetadata.php	2016-06-09 09:14:11 UTC (rev 9514)
@@ -938,6 +938,20 @@
 		$MD_DataIdentification->appendChild($resourceMaintenance);
 		
 	}
+	//generate graphic overview part from preview_image url in mb_metadata table
+	/*<gmd:graphicOverview><gmd:MD_BrowseGraphic><gmd:fileName><gco:CharacterString>https://download.bgr.de/bgr/Geologie/IGK1500/Beispielbild/IGK1500.jpg</gco:CharacterString></gmd:fileName></gmd:MD_BrowseGraphic></gmd:graphicOverview>*/
+	if (isset($mb_metadata['preview_image']) && $mb_metadata['preview_image'] !== "") {
+		$graphicOverview=$iso19139->createElement("gmd:graphicOverview");
+		$MD_BrowseGraphic = $iso19139->createElement("gmd:MD_BrowseGraphic");
+		$fileName = $iso19139->createElement("gmd:fileName");
+		$fileNameCs = $iso19139->createElement("gco:CharacterString");
+		$previewUrl = $iso19139->createTextNode($mb_metadata['preview_image']);
+		$fileNameCs->appendChild($previewUrl);	
+		$fileName->appendChild($fileNameCs);
+		$MD_BrowseGraphic->appendChild($fileName);
+		$graphicOverview->appendChild($MD_BrowseGraphic);
+		$MD_DataIdentification->appendChild($graphicOverview);	
+	}
 	//generate keyword part - for services the inspire themes are not applicable!!!**********
 	//read keywords for resource out of the database/not only layer keywords also featuretype keywords if given!
 	$sql = "SELECT keyword.keyword FROM keyword, layer_keyword WHERE layer_keyword.fkey_layer_id=$1 AND layer_keyword.fkey_keyword_id=keyword.keyword_id";