[Mapbender-commits] r9920 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-06-21 03:40:37 -0700 (Thu, 21 Jun 2018)
New Revision: 9920

Modified:
   trunk/mapbender/http/classes/class_metadata_new.php
Log:
Bugfixes for metadata search - sql was wrong

Modified: trunk/mapbender/http/classes/class_metadata_new.php
===================================================================
--- trunk/mapbender/http/classes/class_metadata_new.php	2018-06-14 10:04:23 UTC (rev 9919)
+++ trunk/mapbender/http/classes/class_metadata_new.php	2018-06-21 10:40:37 UTC (rev 9920)
@@ -126,7 +126,7 @@
 		$this->resourceClassifications[0]['id_wmc'] = 'wmc_serial_id';
 		$this->resourceClassifications[0]['id_dataset'] = 'metadata_id';
 		$this->resourceClassifications[0]['relation_wms'] = 'layer_md_topic_category';
-		$this->resourceClassifications[0]['relation_wfs'] = 'featuretype_md_topic_category';
+		$this->resourceClassifications[0]['relation_wfs'] = 'wfs_featuretype_md_topic_category';
 		$this->resourceClassifications[0]['relation_wmc'] = 'wmc_md_topic_category';
 		$this->resourceClassifications[0]['relation_dataset'] = 'mb_metadata_md_topic_category';
 //TODO: define this in mapbender
@@ -139,7 +139,7 @@
 		$this->resourceClassifications[1]['id_wmc'] = 'wmc_serial_id';
 		$this->resourceClassifications[1]['id_dataset'] = 'metadata_id';
 		$this->resourceClassifications[1]['relation_wms'] = 'layer_inspire_category';
-		$this->resourceClassifications[1]['relation_wfs'] = 'featuretype_inspire_category';
+		$this->resourceClassifications[1]['relation_wfs'] = 'wfs_featuretype_inspire_category';
 		$this->resourceClassifications[1]['relation_wmc'] = 'wmc_inspire_category';		
 		$this->resourceClassifications[1]['relation_dataset'] = 'mb_metadata_inspire_category';
 //TODO: define this in mapbender
@@ -164,7 +164,7 @@
 		$this->resourceClassifications[2]['id_wmc'] = 'wmc_serial_id';
 		$this->resourceClassifications[2]['id_dataset'] = 'metadata_id';
 		$this->resourceClassifications[2]['relation_wms'] = 'layer_custom_category';
-		$this->resourceClassifications[2]['relation_wfs'] = 'featuretype_custom_category';
+		$this->resourceClassifications[2]['relation_wfs'] = 'wfs_featuretype_custom_category';
 		$this->resourceClassifications[2]['relation_wmc'] = 'wmc_custom_category';
 		$this->resourceClassifications[2]['relation_dataset'] = 'mb_metadata_custom_category';
 		//TODO: define this in mapbender
@@ -1693,7 +1693,9 @@
 						}
 					$sqlCat[$i] .= "department, mb_group.mb_group_name";
 					$sqlCategory = $sqlCat[$i];
-					$e = new mb_exception("class_metadata: countOrgaSql: ".$sqlCategory);
+					//TODO solve problem
+					$sqlCategory = str_replace("WHERE  AND", "WHERE", $sqlCategory);
+					//$e = new mb_exception("class_metadata: countOrgaSql: ".$sqlCategory);
 					//call sql for count of category
 					$res = db_prep_query($sqlCategory, $v, $t);
 					$e = new mb_notice("class_metadata: countCatsql: ".$sqlCategory);