[Mapbender-commits] r9878 - in trunk/mapbender/http: classes php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-02-26 07:25:32 -0800 (Mon, 26 Feb 2018)
New Revision: 9878

Modified:
   trunk/mapbender/http/classes/class_iso19139.php
   trunk/mapbender/http/php/mod_exportIso19139.php
Log:
Fix for export urls iso19139 -> rdf/html/iso19139

Modified: trunk/mapbender/http/classes/class_iso19139.php
===================================================================
--- trunk/mapbender/http/classes/class_iso19139.php	2018-02-26 13:32:18 UTC (rev 9877)
+++ trunk/mapbender/http/classes/class_iso19139.php	2018-02-26 15:25:32 UTC (rev 9878)
@@ -1141,8 +1141,8 @@
 			$html .= $tableBegin;
 			//exchange mdtype html with iso19139
 			//$queryNew = str_replace("mdtype=html","mdtype=iso19139",$_SERVER['QUERY_STRING']);
-			$html .= $t_a."<b>"._mb("ISO19139")."</b>: ".$t_b."<a href='".$_SERVER['PHP_SELF']."?".$_SERVER['QUERY_STRING']."&outputFormat=iso19139"."' target='_blank'>"._mb("Metadata")."</a>".$t_c;
-			$html .= $t_a."<b>"._mb("RDF")."</b>: ".$t_b."<a href='".$_SERVER['PHP_SELF']."?".$_SERVER['QUERY_STRING']."&outputFormat=rdf"."' target='_blank'>"._mb("Geo-DCAT Metadata")."</a>".$t_c;
+			$html .= $t_a."<b>"._mb("ISO19139")."</b>: ".$t_b."<a href='".$_SERVER['PHP_SELF']."/../mod_exportIso19139.php?".$_SERVER['QUERY_STRING']."&outputFormat=iso19139"."' target='_blank'>"._mb("Metadata")."</a>".$t_c;
+			$html .= $t_a."<b>"._mb("RDF")."</b>: ".$t_b."<a href='".$_SERVER['PHP_SELF']."/../mod_exportIso19139.php?".$_SERVER['QUERY_STRING']."&outputFormat=rdf"."' target='_blank'>"._mb("Geo-DCAT Metadata")."</a>".$t_c;
 			//<a href='".$_SERVER['PHP_SELF']."?".$queryNew."&validate=true' target='_blank'><img style='border: none;' src = '../img/misc/icn_inspire_validate.png' title='"._mb("INSPIRE Validator")."'></a>
 			//push xml instead of html? But there is no real url
 			$html .= $tableEnd;

Modified: trunk/mapbender/http/php/mod_exportIso19139.php
===================================================================
--- trunk/mapbender/http/php/mod_exportIso19139.php	2018-02-26 13:32:18 UTC (rev 9877)
+++ trunk/mapbender/http/php/mod_exportIso19139.php	2018-02-26 15:25:32 UTC (rev 9878)
@@ -13,9 +13,9 @@
 if (isset($_REQUEST["outputFormat"]) & $_REQUEST["outputFormat"] != "") {
 	//validate to de, en, fr
 	$testMatch = $_REQUEST["outputFormat"];	
- 	if (!($testMatch == 'html' or $testMatch == 'rdf')){ 
+ 	if (!($testMatch == 'html' or $testMatch == 'rdf' or $testMatch == 'iso19139')){ 
 		//echo 'languageCode: <b>'.$testMatch.'</b> is not valid.<br/>'; 
-		echo 'Parameter <b>outputFormat</b> is not valid (html,rdf).<br/>'; 
+		echo 'Parameter <b>outputFormat</b> is not valid (html,rdf,iso19139).<br/>'; 
 		die(); 		
  	}
 	$outputFormat = $testMatch;
@@ -34,5 +34,10 @@
 		header("Content-type: text/xml; charset=UTF-8");
 		echo $rdf;
 	break;
+	case "iso19139":
+		$xml =  $mbMetadata->metadata;
+		header("Content-type: text/xml; charset=UTF-8");
+		echo $xml;
+	break;
 }
 ?>