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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-06-10 00:03:17 -0700 (Fri, 10 Jun 2016)
New Revision: 9519

Modified:
   trunk/mapbender/http/classes/class_metadata_new.php
Log:
Bugfix for counting of categories

Modified: trunk/mapbender/http/classes/class_metadata_new.php
===================================================================
--- trunk/mapbender/http/classes/class_metadata_new.php	2016-06-09 14:47:46 UTC (rev 9518)
+++ trunk/mapbender/http/classes/class_metadata_new.php	2016-06-10 07:03:17 UTC (rev 9519)
@@ -1487,11 +1487,16 @@
 				$sqlKeyword = "select keyword.keyword, COUNT(*) "; 
 				$sqlKeyword .= "FROM (select ";
 				$sqlKeyword .= $this->databaseIdColumnName;
-				$sqlKeyword .= " FROM ".$this->searchView." WHERE ".$whereStr.") as a";
+				//$sqlKeyword .= " FROM ".$this->searchView." WHERE ".$whereStr.") as a";
+				if ($whereStr != '') {
+					$sqlKeyword .= " FROM ".$this->searchView." ".$whereStr.") as a";
+				} else {
+					$sqlKeyword .= " FROM ".$this->searchView.") as a";
+				}
 				$sqlKeyword .= " INNER JOIN ".$this->databaseTableName."_keyword ON (";
 				$sqlKeyword .= $this->databaseTableName."_keyword.fkey_".$this->databaseIdColumnName." = a.";
 				$sqlKeyword .= $this->databaseIdColumnName.") ";
-				$sqlKeyword .= "INNER JOIN keyword ON (keyword.keyword_id=".$this->databaseTableName."_keyword.fkey_keyword_id) WHERE (keyword.keyword NOTNULL AND keyword.keyword <> '')";
+				$sqlKeyword .= "INNER JOIN keyword ON (keyword.keyword_id=".$this->databaseTableName."_keyword.fkey_keyword_id) WHERE (keyword.keyword NOTNULL AND keyword.keyword <> '') ";
 				$sqlKeyword .= "GROUP BY keyword.keyword  ORDER BY COUNT DESC LIMIT  ".$this->maxObjects;
 				//do sql select for keyword cloud
 				$resKeyword = db_prep_query($sqlKeyword, $v, $t);
@@ -1579,9 +1584,17 @@
 						$sqlCat[$i] .= $this->resourceClassifications[$i]['tablename']."_id)";
 						//the following is needed to filter the custom cats for those which should not be seen in the classification
 						if ($this->resourceClassifications[$i]['title'] != $this->resourceClassifications[2]['title']){
-							$sqlCat[$i] .= " WHERE ".$whereStr." GROUP BY ";
+							if ($whereStr != '') {
+								$sqlCat[$i] .= " ".$whereStr." GROUP BY ";
+							} else {
+								$sqlCat[$i] .= " GROUP BY ";
+							}
 						} else {
-							$sqlCat[$i] .= " WHERE ".$whereStr.$this->whereStrCatExtension." GROUP BY ";
+							if ($whereStr != '') {
+								$sqlCat[$i] .= " ".$whereStr.$this->whereStrCatExtension." GROUP BY ";
+							} else {
+								$sqlCat[$i] .= " WHERE ".$this->whereStrCatExtension." GROUP BY ";
+							}
 						}
 						$sqlCat[$i] .= $this->resourceClassifications[$i]['tablename'].".";
 						$sqlCat[$i] .= $this->resourceClassifications[$i]['tablename']."_id,";