[Mapbender-commits] r8673 - trunk/mapbender/http/geoportal

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2013-07-16 05:03:01 -0700 (Tue, 16 Jul 2013)
New Revision: 8673

Modified:
   trunk/mapbender/http/geoportal/mod_readCSWResults.php
   trunk/mapbender/http/geoportal/mod_readCSWResultsDetail.php
Log:
Little bugfix && intstead of ||  ;-)

Modified: trunk/mapbender/http/geoportal/mod_readCSWResults.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_readCSWResults.php	2013-07-16 11:08:58 UTC (rev 8672)
+++ trunk/mapbender/http/geoportal/mod_readCSWResults.php	2013-07-16 12:03:01 UTC (rev 8673)
@@ -214,6 +214,7 @@
 	//echo "<br>CAT ID from DB: ".$row_csw["fkey_cat_id"]."<br>";
 	//get urls for getrecords and getrecordbyid from table cat
         $v = $row_csw["fkey_cat_id"];
+	$e = new mb_notice("<br>cat id: ".$row_csw["fkey_cat_id"]);
 	$t = 'i';
 	$sql_gr = "select param_value, param_name from cat_op_conf where fk_cat_id = $1 and param_type = 'getrecords'";
 	$res_gr = db_prep_query($sql_gr, $v, $t);
@@ -222,21 +223,22 @@
 		switch ($row_gr['param_name']) {
 			case "get" :
 				$csw_list[$cnt_csw] ['getrecordsurl_param_name'] = "get";
-				if (isset($row_gr['param_value']) || $row_gr['param_value'] != '') {
+				if (isset($row_gr['param_value']) && $row_gr['param_value'] != '') {
 					$csw_list[$cnt_csw] ['getrecordsurl'] = $row_gr['param_value'];
 					break 2;
 				}
 			break 1;	
 			case "post" :
 				$csw_list[$cnt_csw] ['getrecordsurl_param_name'] = "post";
-				if (isset($row_gr['param_value']) || $row_gr['param_value'] != '') {
+				if (isset($row_gr['param_value']) && $row_gr['param_value'] != '') {
+					$e = new mb_exception("<br>getrecords: ".$row_gr['param_value']);
 					$csw_list[$cnt_csw] ['getrecordsurl'] = $row_gr['param_value'];
 					break 2;
 				}
 			break 1;
 			case "post_xml" :
 				$csw_list[$cnt_csw] ['getrecordsurl_param_name'] = "post_xml";
-				if (isset($row_gr['param_value']) || $row_gr['param_value'] != '' ) {
+				if (isset($row_gr['param_value']) && $row_gr['param_value'] != '' ) {
 					$csw_list[$cnt_csw] ['getrecordsurl'] = $row_gr['param_value'];
 					break 2;
 				}

Modified: trunk/mapbender/http/geoportal/mod_readCSWResultsDetail.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_readCSWResultsDetail.php	2013-07-16 11:08:58 UTC (rev 8672)
+++ trunk/mapbender/http/geoportal/mod_readCSWResultsDetail.php	2013-07-16 12:03:01 UTC (rev 8673)
@@ -696,21 +696,21 @@
 		switch ($row_gr['param_name']) {
 			case "get" :
 				$csw_list[$cnt_csw] ['getrecordsurl_param_name'] = "get";
-				if (isset($row_gr['param_value']) || $row_gr['param_value'] != '') {
+				if (isset($row_gr['param_value']) && $row_gr['param_value'] != '') {
 					$csw_list[$cnt_csw] ['getrecordsurl'] = $row_gr['param_value'];
 					break 2;
 				}
 			break 1;	
 			case "post" :
 				$csw_list[$cnt_csw] ['getrecordsurl_param_name'] = "post";
-				if (isset($row_gr['param_value']) || $row_gr['param_value'] != '') {
+				if (isset($row_gr['param_value']) && $row_gr['param_value'] != '') {
 					$csw_list[$cnt_csw] ['getrecordsurl'] = $row_gr['param_value'];
 					break 2;
 				}
 			break 1;
 			case "post_xml" :
 				$csw_list[$cnt_csw] ['getrecordsurl_param_name'] = "post_xml";
-				if (isset($row_gr['param_value']) || $row_gr['param_value'] != '' ) {
+				if (isset($row_gr['param_value']) && $row_gr['param_value'] != '' ) {
 					$csw_list[$cnt_csw] ['getrecordsurl'] = $row_gr['param_value'];
 					break 2;
 				}