[mapserver-commits] r10141 - trunk/mapserver/mapscript/php

[svn at osgeo.org]

Author: assefa
Date: 2010-05-07 13:49:41 -0400 (Fri, 07 May 2010)
New Revision: 10141

Modified:
   trunk/mapserver/mapscript/php/layer.c
   trunk/mapserver/mapscript/php/map.c
Log:
setprojection on map and layer should not return a fatal errors (#3436)

Modified: trunk/mapserver/mapscript/php/layer.c
===================================================================
--- trunk/mapserver/mapscript/php/layer.c	2010-05-07 15:42:29 UTC (rev 10140)
+++ trunk/mapserver/mapscript/php/layer.c	2010-05-07 17:49:41 UTC (rev 10141)
@@ -839,8 +839,8 @@
 
     if ((status = layerObj_setProjection(php_layer->layer, projection)) != MS_SUCCESS)
     {
-        mapscript_throw_mapserver_exception("" TSRMLS_CC);
-        return;
+        mapscript_report_php_error(E_WARNING, "setProjection failed" TSRMLS_CC);
+        return MS_FAILURE;
     }
 
     php_projection->projection = &(php_layer->layer->projection);

Modified: trunk/mapserver/mapscript/php/map.c
===================================================================
--- trunk/mapserver/mapscript/php/map.c	2010-05-07 15:42:29 UTC (rev 10140)
+++ trunk/mapserver/mapscript/php/map.c	2010-05-07 17:49:41 UTC (rev 10141)
@@ -3502,7 +3502,7 @@
 
     if (status == -1)
     {
-        mapscript_throw_mapserver_exception("" TSRMLS_CC);
+        mapscript_report_php_error(E_WARNING, "setProjection failed" TSRMLS_CC);
         return MS_FAILURE;
     }
     else
@@ -3531,7 +3531,7 @@
         }
     }
 
-    return status;
+    return MS_SUCCESS;
 #else
     mapscript_throw_exception("Available only with PROJ.4 support." TSRMLS_CC);
     return MS_FAILURE;