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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2010-09-07 14:54:09 +0000 (Tue, 07 Sep 2010)
New Revision: 6913

Modified:
   trunk/mapbender/http/classes/class_metadata_new.php
Log:
Extent search module to serve logo urls of mb_groups to json result files.

Modified: trunk/mapbender/http/classes/class_metadata_new.php
===================================================================
--- trunk/mapbender/http/classes/class_metadata_new.php	2010-09-07 11:40:32 UTC (rev 6912)
+++ trunk/mapbender/http/classes/class_metadata_new.php	2010-09-07 14:54:09 UTC (rev 6913)
@@ -218,7 +218,7 @@
 				$this->databaseIdColumnName = 'layer_id';
 				$this->databaseTableName = 'layer';
 				//$this->keywordRelation = 'layer_keyword';
-				$this->searchView = 'wms_search_table_test';
+				$this->searchView = 'wms_search_table';
 				switch ($this->orderBy) {
 					case "rank":
 						$this->orderBy = " ORDER BY load_count DESC";
@@ -334,6 +334,7 @@
 				$this->wfsJSON->wfs->srv[$i-$j]->abstract = $wfsMatrix[$i]['wfs_abstract'];
 				$this->wfsJSON->wfs->srv[$i-$j]->date = date("d.m.Y",$wfsMatrix[$i]['wfs_timestamp']);
 				$this->wfsJSON->wfs->srv[$i-$j]->respOrg = $wfsMatrix[$i]['mb_group_name'];
+				$this->wfsJSON->wfs->srv[$i-$j]->logoUrl = $wfsMatrix[$i]['mb_group_logo_path'];
 				$this->wfsJSON->wfs->srv[$i-$j]->mdLink = "http://".$this->hostName."/mapbender/x_geoportal/showWFSMetadata.php?id=".$wfsMatrix[$i]['wfs_id'];
 				$spatialSource = "";
 				$stateOrProvince = $wfsMatrix[$i]['administrativearea']; 
@@ -574,6 +575,7 @@
 				}
 				$this->wmsJSON->wms->srv[$j]->iso3166 = $spatialSource;
 				$this->wmsJSON->wms->srv[$j]->respOrg = $subLayers[$rootIndex]['mb_group_name'];
+				$this->wmsJSON->wms->srv[$j]->logoUrl = $subLayers[$rootIndex]['mb_group_logo_path'];
 				#$this->wmsJSON->wms->srv[$j]->tou = $subLayers[$rootIndex]['termsofuse'];
 				//check if a disclaimer has to be shown and give the relevant symbol
 				list($hasConstraints, $symbolLink) = $this->hasConstraints("wms", $subLayers[$rootIndex]['wms_id']);