[Mapbender-commits] r6064 - trunk/mapbender/http/plugins

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-05-03 10:20:41 -0400 (Mon, 03 May 2010)
New Revision: 6064

Modified:
   trunk/mapbender/http/plugins/mb_metadata_server.php
Log:
categories

Modified: trunk/mapbender/http/plugins/mb_metadata_server.php
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_server.php	2010-05-03 14:20:18 UTC (rev 6063)
+++ trunk/mapbender/http/plugins/mb_metadata_server.php	2010-05-03 14:20:41 UTC (rev 6064)
@@ -85,7 +85,8 @@
 		$resultObj = array();
 		while ($row = db_fetch_assoc($res)) {
 			foreach ($row as $key => $value) {
-				$resultObj["wms:".$key] = $value;
+//				$resultObj["wms:".$key] = $value;
+				$resultObj[$key] = $value;
 			}
 		}
 		$ajaxResponse->setResult($resultObj);
@@ -96,22 +97,23 @@
 		
 	case "getCategories":
 		$resultObj = array(
-			"inspire" => array(),
-			"custom" => array()
+			"categories" => array(
+				"fkey_inspire_category_id" => array(),
+				"fkey_custom_category_id" => array()
+			)
 		);
 
-
 		$sql = "SELECT inspire_category_id, inspire_category_code_en FROM inspire_category";
 		$res = db_query($sql);
 		while ($row = db_fetch_row($res)) {
-			$resultObj["inspire"][]= $row;
+			$resultObj["categories"]["fkey_inspire_category_id"][]= $row;
 		}
 
 		$sql = "SELECT custom_category_id, custom_category_code_en FROM custom_category";
 		$res = db_query($sql);
-		$resultObj = array();
+
 		while ($row = db_fetch_row($res)) {
-			$resultObj["custom"][]= $row;
+			$resultObj["categories"]["fkey_custom_category_id"][]= $row;
 		}
 		$ajaxResponse->setResult($resultObj);
 		$ajaxResponse->setSuccess(true);