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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-01-27 04:25:45 -0800 (Wed, 27 Jan 2016)
New Revision: 9391

Modified:
   trunk/mapbender/http/php/mod_inspireDownloadFeed.php
Log:
Fix output_format handling - union formats from wfs and wfs_featuretype

Modified: trunk/mapbender/http/php/mod_inspireDownloadFeed.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2016-01-27 12:16:22 UTC (rev 9390)
+++ trunk/mapbender/http/php/mod_inspireDownloadFeed.php	2016-01-27 12:25:45 UTC (rev 9391)
@@ -1869,9 +1869,9 @@
 					//do a special select to get all outputformats from database
 					$mapbenderMetadata[$indexMapbenderMetadata]->output_formats = array();
 					//$e = new mb_exception("php/mod_inspireDownloadFeed.php: owfsId: ".$mapbenderMetadata[$indexMapbenderMetadata]->wfs_id);
-					$sql = "SELECT output_format from wfs_output_formats WHERE fkey_wfs_id = $1";			
-					$v = array($mapbenderMetadata[$indexMapbenderMetadata]->wfs_id);
-					$t = array('i');
+					$sql = "SELECT output_format from wfs_output_formats WHERE fkey_wfs_id = $1 UNION SELECT output_format FROM wfs_featuretype_output_formats WHERE fkey_featuretype_id = $2";			
+					$v = array($mapbenderMetadata[$indexMapbenderMetadata]->wfs_id, $mapbenderMetadata[$indexMapbenderMetadata]->featuretype_id);
+					$t = array('i', 'i');
 					$res = db_prep_query($sql,$v,$t);
 					while ($row = db_fetch_array($res)) {
 						$mapbenderMetadata[$indexMapbenderMetadata]->output_formats[] = $row['output_format'];