[Mapbender-commits] r10167 - in trunk/mapbender: conf http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-06-28 03:13:49 -0700 (Fri, 28 Jun 2019)
New Revision: 10167

Modified:
   trunk/mapbender/conf/isoMetadata.conf
   trunk/mapbender/http/classes/class_iso19139.php
Log:
Fix for html metadata representation if more than one preview image is available - show only the first one!

Modified: trunk/mapbender/conf/isoMetadata.conf
===================================================================
--- trunk/mapbender/conf/isoMetadata.conf	2019-06-28 09:08:17 UTC (rev 10166)
+++ trunk/mapbender/conf/isoMetadata.conf	2019-06-28 10:13:49 UTC (rev 10167)
@@ -620,7 +620,7 @@
 //Preview (36)
 array(	ibus => "t01_object.obj_id",
 	iso19139 => "/gmd:MD_Metadata/gmd:identificationInfo/*/gmd:graphicOverview/gmd:MD_BrowseGraphic/gmd:fileName/gco:CharacterString",
-	iso19139explode => "false" ,
+	iso19139explode => "true" ,
 	inspire => "preview",
 	inspiremandatory => "false",
 	iso_name => "graphicOverview",

Modified: trunk/mapbender/http/classes/class_iso19139.php
===================================================================
--- trunk/mapbender/http/classes/class_iso19139.php	2019-06-28 09:08:17 UTC (rev 10166)
+++ trunk/mapbender/http/classes/class_iso19139.php	2019-06-28 10:13:49 UTC (rev 10167)
@@ -784,7 +784,11 @@
 					}
 					$iso19139Hash[$a]['value'] = ltrim($iso19139Hash[$a]['value'],',');
 				} else {
-					$iso19139Hash[$a]['value'] = $resultOfXpath;
+					/*if (is_array($resultOfXpath)) {
+						$iso19139Hash[$a]['value'] = $resultOfXpath[0];
+					} else {*/
+						$iso19139Hash[$a]['value'] = $resultOfXpath;
+					//}
 				}
 			}
 			//generate html
@@ -914,6 +918,9 @@
 				$html .= $this->getHtmlRow($t_a, $t_b, $t_c, $iso19139Hash, $index);
 			}
 			if ($iso19139Hash[36]['value'] != "") {
+				if (is_array($iso19139Hash[36]['value'])) {
+					$iso19139Hash[36]['value'] = $iso19139Hash[36]['value'][0];
+				}
 				$html .= $t_a."<b>".$iso19139Hash[36]['html']."</b>: ".$t_b."<img width=120 height=120 src = '".$iso19139Hash[36]['value']."'>".$t_c;//preview
 			}
 			//resource identifier