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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-09-26 07:08:37 -0700 (Mon, 26 Sep 2016)
New Revision: 9604

Modified:
   trunk/mapbender/http/php/mod_dataISOMetadata.php
Log:
Fix for redundant categories in metadata export module

Modified: trunk/mapbender/http/php/mod_dataISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_dataISOMetadata.php	2016-09-26 14:07:19 UTC (rev 9603)
+++ trunk/mapbender/http/php/mod_dataISOMetadata.php	2016-09-26 14:08:37 UTC (rev 9604)
@@ -954,7 +954,7 @@
 	}
 	//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";
+	$sql = "SELECT DISTINCT keyword.keyword FROM keyword, layer_keyword WHERE layer_keyword.fkey_layer_id=$1 AND layer_keyword.fkey_keyword_id=keyword.keyword_id";
 	$v = array((integer)$layerId);
 	$t = array('i');
 	$res = db_prep_query($sql,$v,$t);
@@ -974,7 +974,7 @@
 	//pull special keywords from custom categories:
 	$e = new mb_notice("layer: ".$layerId);	
 
-	$sql = "SELECT custom_category.custom_category_key FROM custom_category, layer_custom_category WHERE layer_custom_category.fkey_layer_id = $1 AND layer_custom_category.fkey_custom_category_id =  custom_category.custom_category_id AND custom_category_hidden = 0";
+	$sql = "SELECT DISTINCT custom_category.custom_category_key FROM custom_category, layer_custom_category WHERE layer_custom_category.fkey_layer_id = $1 AND layer_custom_category.fkey_custom_category_id =  custom_category.custom_category_id AND custom_category_hidden = 0";
 	$v = array((integer)$layerId);
 	$t = array('i');
 	$res = db_prep_query($sql,$v,$t);
@@ -1000,7 +1000,7 @@
 /* example
 <gmd:keyword><gco:CharacterString>Geographical names</gco:CharacterString></gmd:keyword><gmd:thesaurusName><gmd:CI_Citation><gmd:title><gco:CharacterString>GEMET - INSPIRE themes, version 1.0</gco:CharacterString></gmd:title><gmd:date><gmd:CI_Date><gmd:date><gco:Date>2008-06-01</gco:Date></gmd:date><gmd:dateType><gmd:CI_DateTypeCode codeList="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#CI_DateTypeCode" codeListValue="publication">publication</gmd:CI_DateTypeCode></gmd:dateType></gmd:CI_Date></gmd:date></gmd:CI_Citation></gmd:thesaurusName></gmd:MD_Keywords></gmd:descriptiveKeywords><gmd:descriptiveKeywords><gmd:MD_Keywords><gmd:keyword><gco:CharacterString>BasisDLM</gco:CharacterString></gmd:keyword>	
 */
-	$sql = "SELECT inspire_category.inspire_category_code_en FROM inspire_category, layer_inspire_category WHERE layer_inspire_category.fkey_layer_id=$1 AND layer_inspire_category.fkey_inspire_category_id=inspire_category.inspire_category_id";
+	$sql = "SELECT DISTINCT inspire_category.inspire_category_code_en FROM inspire_category, layer_inspire_category WHERE layer_inspire_category.fkey_layer_id=$1 AND layer_inspire_category.fkey_inspire_category_id=inspire_category.inspire_category_id";
 	$v = array((integer)$layerId);
 	$t = array('i');
 	$res = db_prep_query($sql,$v,$t);
@@ -1302,7 +1302,7 @@
 	#Topic Category B 2.1 - not needed for services
 
 	//read keywords for resource out of the database:
-	$sql = "SELECT md_topic_category.md_topic_category_code_en FROM md_topic_category, layer_md_topic_category WHERE layer_md_topic_category.fkey_layer_id = $1 AND layer_md_topic_category.fkey_md_topic_category_id=md_topic_category.md_topic_category_id";
+	$sql = "SELECT DISTINCT md_topic_category.md_topic_category_code_en FROM md_topic_category, layer_md_topic_category WHERE layer_md_topic_category.fkey_layer_id = $1 AND layer_md_topic_category.fkey_md_topic_category_id=md_topic_category.md_topic_category_id";
 	$v = array((integer)$layerId);
 	$t = array('i');
 	$res = db_prep_query($sql,$v,$t);