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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-01-04 06:17:38 -0800 (Thu, 04 Jan 2018)
New Revision: 9839

Modified:
   trunk/mapbender/http/classes/class_administration.php
   trunk/mapbender/http/php/mod_showMetadata.php
Log:
Further fix for contact metadata

Modified: trunk/mapbender/http/classes/class_administration.php
===================================================================
--- trunk/mapbender/http/classes/class_administration.php	2018-01-04 14:05:21 UTC (rev 9838)
+++ trunk/mapbender/http/classes/class_administration.php	2018-01-04 14:17:38 UTC (rev 9839)
@@ -2260,7 +2260,7 @@
 			$sql = "SELECT wfs_id as id, fkey_mb_group_id, wfs_owner as owner FROM wfs WHERE wfs_id = $1";
 			break;
 		case "wmc":
-			$sql = "SELECT wmc_serial_id as id, fkey_user_id as owner FROM mb_user_wmc WHERE wmc_serial_id = $1";
+			$sql = "SELECT wmc_serial_id as id, null as fkey_mb_group_id, fkey_user_id as owner FROM mb_user_wmc WHERE wmc_serial_id = $1";
 			break;
 	}
 	//get resource owner information

Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php	2018-01-04 14:05:21 UTC (rev 9838)
+++ trunk/mapbender/http/php/mod_showMetadata.php	2018-01-04 14:17:38 UTC (rev 9839)
@@ -625,7 +625,11 @@
 	$serviceType = "wfs";
 }
 
-$metadataContactGroup = $admin->getOrgaInfoFromRegistry($serviceType, $resourceMetadata['serviceid'], $resourceMetadata['owner']);
+if ($resource == 'wmc') {
+	$metadataContactGroup = $admin->getOrgaInfoFromRegistry('wmc', $resourceMetadata['contentid'], $resourceMetadata['owner']);
+} else {
+	$metadataContactGroup = $admin->getOrgaInfoFromRegistry($serviceType, $resourceMetadata['serviceid'], $resourceMetadata['owner']);
+}
 
 //Get Geometry Type if featuretype info was requested
 if ($resource == 'featuretype') {
@@ -637,7 +641,7 @@
 	$resourceMetadata['featuretype_geomType'] = $featuretypeElements['element_type'];
 }
 
-$e = new mb_notice("mod_showMetadata: mb_group_name: ".$metadataContactGroup['mb_group_name']);
+$e = new mb_exception("mod_showMetadata: mb_group_name: ".$metadataContactGroup['mb_group_name']);
 //db select for layer previews
 if ($resource == 'wms' or $resource == 'layer') {
 	$resourceMetadata['preview'] = "<img class='responsivimg' src = '../geoportal/mod_showPreview.php?resource=layer&id=".$layerId."'>";
@@ -957,6 +961,8 @@
    return false;><img src='../img/osgeo_graphics/layer-wms-add.png'>".$translation['showMap']."</button>".$t_b."".$t_c;
 	
 }
+//add dynamic preview in rdfa
+$html .= $t_a.$t_b.'<span hidden="hidden" property="contentLocation" typeof="Place"><span hidden="hidden" property="hasMap" href="'.$getMapUrl.'"></span></span>'.$t_c;
 //new for share and discuss metadata by twitter
 if (TWITTER_METADATA) {
 	if ($resource == 'wfs' or $resource == 'wms') {
@@ -1070,8 +1076,7 @@
 		$html .= $t_a.$translation['wgs84BboxGraphic'].$t_b.$translation['graphicUnavailable'].$t_c;
 	}
 	//show preview map - dynamically
-	//add dynamic preview in rdfa
-$html .= $t_a.$t_b.'<span hidden="hidden" property="contentLocation" typeof="Place"><span hidden="hidden" property="hasMap" href="'.$getMapUrl.'"></span></span>'.$t_c;
+	
 }
 //$html .= $tableEnd;
 //$html .= $tableBegin;