[fusion-commits] r1798 - trunk/layers/MapServer/php

[svn_fusion at osgeo.org]

Author: pdeschamps
Date: 2009-02-20 14:03:59 -0500 (Fri, 20 Feb 2009)
New Revision: 1798

Modified:
   trunk/layers/MapServer/php/Maptip.php
Log:
added error handling for invalid layername entered in the appdef. 


Modified: trunk/layers/MapServer/php/Maptip.php
===================================================================
--- trunk/layers/MapServer/php/Maptip.php	2009-02-20 18:42:38 UTC (rev 1797)
+++ trunk/layers/MapServer/php/Maptip.php	2009-02-20 19:03:59 UTC (rev 1798)
@@ -77,13 +77,18 @@
     if ($spatialFilter !== false ) {
         $oSpatialFilter = ms_shapeObjFromWkt($spatialFilter);
     }
-    
+
     $aMapTips = array();
     $aURL = array();
     $aTipLabel = array();
     foreach($aLayer as $key=>$layer){
-        $oLayer = $oMap->GetLayerByName($layer);
+        $oLayer = @$oMap->GetLayerByName($layer);
 
+        if(!is_object($oLayer)){
+            echo  "{'maptips':'','url':'','label':'','error':' The layer [".$layer."] was not found'}";
+            die();
+        }
+
         $oLayer->set('tolerance', 0);
 
         if ($oLayer->type ==  MS_LAYER_RASTER || $oLayer->type == MS_LAYER_QUERY ||
@@ -98,7 +103,7 @@
             $oLayer->open();
 
             $oShape = $oLayer->getShape($oRes->tileindex,$oRes->shapeindex);
-           
+
             $szMapTipText .= $oLayer->name." : ".$oShape->values[$aMapTipTextField[$key]].$szBreak;
 
             $szLabels = $aLabel[$key];
@@ -109,12 +114,12 @@
             $szMapTip = $szMapTip != "undefined" ? $szMapTip : "";
             $szURL = $szURL != "undefined" ? $szURL : "";
             $szLabels = $szLabels != "undefined" ? $szLabels : "";
-            
 
+
             array_push($aMapTips, $szMapTip);
             array_push($aURL, $szURL);
             array_push($aTipLabel,$szLabels);
-            
+
             $oLayer->close();
         }
     }