[Mapbender-commits] r9255 - in trunk/mapbender/http: javascripts php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2015-07-14 04:46:05 -0700 (Tue, 14 Jul 2015)
New Revision: 9255

Modified:
   trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_server.php
   trunk/mapbender/http/php/mb_list_wmc_local_data.php
   trunk/mapbender/http/php/mod_dataISOMetadata.php
   trunk/mapbender/http/php/mod_getDownloadOptions.php
   trunk/mapbender/http/php/mod_getWmcDisclaimer.php
Log:
Less exceptions

Modified: trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_server.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_server.php	2015-07-14 09:43:56 UTC (rev 9254)
+++ trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_server.php	2015-07-14 11:46:05 UTC (rev 9255)
@@ -169,8 +169,6 @@
 	$myWfsFactory = new UniversalWfsFactory();
 	$myWfs = $myWfsFactory->createFromDb($wfsId);
 	$data = $myWfs->getFeature($typename, $filter,$destSrs, $storedQueryId, $storedQueryParams, null);
-	//$e = new mb_exception($filter);
-	$e = new mb_exception($data);
 	
 	if ($data === null) die('{}');
 	
@@ -214,7 +212,6 @@
 	$myWfsFactory = new UniversalWfsFactory();
 	$myWfs = $myWfsFactory->createFromDb($wfsId);
 	$data = $myWfs->getFeature($wfsFeatureTypeName, null, $destSrs, null, null, 20);
-	$e = new mb_exception($data);
 	if ($data === null) die('{}');
 	if (defined("WFS_RESPONSE_SIZE_LIMIT") && WFS_RESPONSE_SIZE_LIMIT < strlen($data)) {
 		die("Too many results, please restrict your search.");

Modified: trunk/mapbender/http/php/mb_list_wmc_local_data.php
===================================================================
--- trunk/mapbender/http/php/mb_list_wmc_local_data.php	2015-07-14 09:43:56 UTC (rev 9254)
+++ trunk/mapbender/http/php/mb_list_wmc_local_data.php	2015-07-14 11:46:05 UTC (rev 9255)
@@ -36,8 +36,7 @@
        		' = a.wmc_local_data_fkey_termsofuse_id where wmc_has_local_data = 1 and'.
        		'(fkey_user_id = $1 or (wmc_local_data_public = 1 AND fkey_user_id in ('.
 		'select mb_user_id from mb_user_mb_group inner join mb_user on mb_user_mb_group.fkey_mb_user_id = mb_user.mb_user_id where mb_user_mb_group.fkey_mb_group_id = '.$registratingGroupId.
-		')));';
-	$e = new mb_exception("sql: ".$sql);	
+		')));';	
 } else {
 	$sql = 'select a.wmc_serial_id, a.wmc_local_data_public, a.wmc_title, a.wmc_timestamp, a.wmc_local_data_size,'.
        		' a.fkey_user_id, termsofuse.symbollink from mb_user_wmc a left join termsofuse on termsofuse.termsofuse_id'.

Modified: trunk/mapbender/http/php/mod_dataISOMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_dataISOMetadata.php	2015-07-14 09:43:56 UTC (rev 9254)
+++ trunk/mapbender/http/php/mod_dataISOMetadata.php	2015-07-14 11:46:05 UTC (rev 9255)
@@ -204,7 +204,7 @@
 SQL;
 	//TODO: Problem - the metadata may be used for more than one service - not often but sometimes - does one get the right contact data?
 	//TODO: Problem - this is also the fact if the data is provided by a wfs featuretype! There maybe other contact infos - maybe the info should be integrated more than once and identical info should be identified
-	$e = new mb_exception("used metadata id: ".$mb_metadata['metadata_id']);
+	$e = new mb_notice("used metadata id: ".$mb_metadata['metadata_id']);
 	$v = array($mb_metadata['metadata_id']);
 	$t = array('i');
 	$res = db_prep_query($sql,$v,$t);

Modified: trunk/mapbender/http/php/mod_getDownloadOptions.php
===================================================================
--- trunk/mapbender/http/php/mod_getDownloadOptions.php	2015-07-14 09:43:56 UTC (rev 9254)
+++ trunk/mapbender/http/php/mod_getDownloadOptions.php	2015-07-14 11:46:05 UTC (rev 9255)
@@ -46,7 +46,7 @@
 		die(); 		
  	}
 	$languageCode = $testMatch;
-	$e = new mb_exception("mod_showMetadata.php: languageCode from GET parameter: ".$languageCode);
+	$e = new mb_notice("mod_showMetadata.php: languageCode from GET parameter: ".$languageCode);
 	$testMatch = NULL;
 }
 

Modified: trunk/mapbender/http/php/mod_getWmcDisclaimer.php
===================================================================
--- trunk/mapbender/http/php/mod_getWmcDisclaimer.php	2015-07-14 09:43:56 UTC (rev 9254)
+++ trunk/mapbender/http/php/mod_getWmcDisclaimer.php	2015-07-14 11:46:05 UTC (rev 9255)
@@ -39,7 +39,7 @@
 	//validate to wms, wfs
 	$testMatch = $_REQUEST["withHeader"];	
  	if (!($testMatch == 'true' or $testMatch == 'false')){ 
-		echo 'languageCode is not a valid boolean.<br/>'; 
+		echo 'withHeader is not a valid boolean.<br/>'; 
 		die(); 		
  	} else {
 		switch ($testMatch) {
@@ -86,7 +86,7 @@
 		die(); 		
  	}
 	$languageCode = $testMatch;
-	$e = new mb_exception("mod_showMetadata.php: languageCode from GET parameter: ".$languageCode);
+	$e = new mb_notice("mod_showMetadata.php: languageCode from GET parameter: ".$languageCode);
 	$testMatch = NULL;
 }