[mapguide-commits] r4755 - in trunk/MgDev/Web/src: mapadmin mapviewerjava mapviewernet mapviewerphp schemareport

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Wed Apr 7 16:31:03 EDT 2010


Author: brucedechant
Date: 2010-04-07 16:31:02 -0400 (Wed, 07 Apr 2010)
New Revision: 4755

Modified:
   trunk/MgDev/Web/src/mapadmin/addgroup.php
   trunk/MgDev/Web/src/mapadmin/addserver.php
   trunk/MgDev/Web/src/mapadmin/addunmanageddata.php
   trunk/MgDev/Web/src/mapadmin/adduser.php
   trunk/MgDev/Web/src/mapadmin/assignroles.php
   trunk/MgDev/Web/src/mapadmin/displaypackagelog.php
   trunk/MgDev/Web/src/mapadmin/downloadlogfile.php
   trunk/MgDev/Web/src/mapadmin/editgroup.php
   trunk/MgDev/Web/src/mapadmin/editunmanageddata.php
   trunk/MgDev/Web/src/mapadmin/edituser.php
   trunk/MgDev/Web/src/mapadmin/groupmanagement.php
   trunk/MgDev/Web/src/mapadmin/grouprolemanagement.php
   trunk/MgDev/Web/src/mapadmin/help.php
   trunk/MgDev/Web/src/mapadmin/loadpackage.php
   trunk/MgDev/Web/src/mapadmin/logmanagement.php
   trunk/MgDev/Web/src/mapadmin/logproperties.php
   trunk/MgDev/Web/src/mapadmin/makepackage.php
   trunk/MgDev/Web/src/mapadmin/packagemanagement.php
   trunk/MgDev/Web/src/mapadmin/serverdatafunctions.php
   trunk/MgDev/Web/src/mapadmin/servermanagement.php
   trunk/MgDev/Web/src/mapadmin/serverproperties.php
   trunk/MgDev/Web/src/mapadmin/servicesproperties.php
   trunk/MgDev/Web/src/mapadmin/unmanageddatamanagement.php
   trunk/MgDev/Web/src/mapadmin/usermanagement.php
   trunk/MgDev/Web/src/mapadmin/userrolemanagement.php
   trunk/MgDev/Web/src/mapadmin/viewcurrentlog.php
   trunk/MgDev/Web/src/mapadmin/viewcurrentlogbottom.php
   trunk/MgDev/Web/src/mapadmin/viewcurrentlogtop.php
   trunk/MgDev/Web/src/mapadmin/viewserverstatus.php
   trunk/MgDev/Web/src/mapadmin/viewserverstatusbottom.php
   trunk/MgDev/Web/src/mapadmin/viewserverstatustop.php
   trunk/MgDev/Web/src/mapadmin/wfsproperties.php
   trunk/MgDev/Web/src/mapadmin/wmsproperties.php
   trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp
   trunk/MgDev/Web/src/mapviewerjava/search.jsp
   trunk/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp
   trunk/MgDev/Web/src/mapviewerjava/taskframe.jsp
   trunk/MgDev/Web/src/mapviewernet/buffer.aspx
   trunk/MgDev/Web/src/mapviewernet/mainframe.aspx
   trunk/MgDev/Web/src/mapviewernet/measure.aspx
   trunk/MgDev/Web/src/mapviewernet/search.aspx
   trunk/MgDev/Web/src/mapviewernet/serveradminhelper.aspx
   trunk/MgDev/Web/src/mapviewernet/taskframe.aspx
   trunk/MgDev/Web/src/mapviewerphp/capturerequest.php
   trunk/MgDev/Web/src/mapviewerphp/createlayer.php
   trunk/MgDev/Web/src/mapviewerphp/legend.php
   trunk/MgDev/Web/src/mapviewerphp/mainframe.php
   trunk/MgDev/Web/src/mapviewerphp/serveradminhelper.php
   trunk/MgDev/Web/src/schemareport/displayschema.php
   trunk/MgDev/Web/src/schemareport/main.php
   trunk/MgDev/Web/src/schemareport/showclass.php
   trunk/MgDev/Web/src/schemareport/showgeom.php
Log:
Fix for trac ticket 1292 - Update to PHP 5.3
http://trac.osgeo.org/mapguide/ticket/1292

Notes: 
- Update mapadmin, viewers, and schema report 
- Change API GetMessage() to GetExceptionMessage() due to PHP conflict 
- Change API GetCode() to GetScriptCode() due to PHP conflict 


Modified: trunk/MgDev/Web/src/mapadmin/addgroup.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/addgroup.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/addgroup.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -97,7 +97,7 @@
     catch ( MgException $e )
     {
         CheckForFatalMgException( $e );
-        $errorMsg = $e->GetMessage();
+        $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/addserver.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/addserver.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/addserver.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -82,7 +82,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/addunmanageddata.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/addunmanageddata.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/addunmanageddata.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -107,7 +107,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/adduser.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/adduser.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/adduser.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -127,7 +127,7 @@
     catch ( MgException $e )
     {
         CheckForFatalMgException( $e );
-        $errorMsg = $e->GetMessage();
+        $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/assignroles.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/assignroles.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/assignroles.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -153,7 +153,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/displaypackagelog.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/displaypackagelog.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/displaypackagelog.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -70,7 +70,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/downloadlogfile.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/downloadlogfile.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/downloadlogfile.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -72,7 +72,7 @@
     {
         CheckForFatalMgException( $e );
         if ( empty( $errorMsg ) )
-            $errorMsg = $e->GetMessage();
+            $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/editgroup.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/editgroup.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/editgroup.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -117,7 +117,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/editunmanageddata.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/editunmanageddata.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/editunmanageddata.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -119,7 +119,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/edituser.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/edituser.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/edituser.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -139,7 +139,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/groupmanagement.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/groupmanagement.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/groupmanagement.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -72,7 +72,7 @@
     catch ( MgException $e )
     {
         CheckForFatalMgException( $e );
-        $errorMsg = $e->GetMessage();
+        $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {
@@ -99,7 +99,7 @@
 {
     CheckForFatalMgException( $e );
     if ( empty( $errorMsg ) )
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/grouprolemanagement.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/grouprolemanagement.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/grouprolemanagement.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -115,7 +115,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {
@@ -150,7 +150,7 @@
 {
     CheckForFatalMgException( $e );
     if ( empty( $errorMsg ) )
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/help.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/help.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/help.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -51,7 +51,7 @@
     catch ( MgException $e )
     {
         CheckForFatalMgException( $e );
-        $errorMsg = $e->GetMessage();
+        $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/loadpackage.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/loadpackage.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/loadpackage.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -62,7 +62,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $packageLoadErrorMsg = $e->GetMessage();
+    $packageLoadErrorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/logmanagement.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/logmanagement.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/logmanagement.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -96,7 +96,7 @@
     catch ( MgException $e )
     {
         CheckForFatalMgException( $e );
-        $errorMsg = $e->GetMessage();
+        $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {
@@ -125,7 +125,7 @@
     {
         CheckForFatalMgException( $e );
         if ( empty( $errorMsg ) )
-            $errorMsg = $e->GetMessage();
+            $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/logproperties.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/logproperties.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/logproperties.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -222,7 +222,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/makepackage.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/makepackage.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/makepackage.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -98,7 +98,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $packageMakeErrorMsg = sprintf( $errCannotCreatePackage, $packageName, $folderName ).$e->GetMessage();
+    $packageMakeErrorMsg = sprintf( $errCannotCreatePackage, $packageName, $folderName ).$e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/packagemanagement.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/packagemanagement.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/packagemanagement.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -160,7 +160,7 @@
         {
             CheckForFatalMgException( $e );
             if ( empty( $packageLoadErrorMsg ) )
-                $packageLoadErrorMsg = $e->GetMessage();
+                $packageLoadErrorMsg = $e->GetExceptionMessage();
         }
         catch ( Exception $e )
         {
@@ -182,7 +182,7 @@
 {
     CheckForFatalMgException( $e );
     if ( empty( $packageLoadErrorMsg ) )
-        $packageLoadErrorMsg = $e->GetMessage();
+        $packageLoadErrorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/serverdatafunctions.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/serverdatafunctions.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/serverdatafunctions.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -1874,7 +1874,7 @@
             }
             catch ( MgException $e )
             {
-                $this->status = sprintf( $errCannotGetPackageStatus, $e->GetMessage() );
+                $this->status = sprintf( $errCannotGetPackageStatus, $e->GetExceptionMessage() );
             }
         }
     }

Modified: trunk/MgDev/Web/src/mapadmin/servermanagement.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/servermanagement.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/servermanagement.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -101,7 +101,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {
@@ -158,7 +158,7 @@
 {
     CheckForFatalMgException( $e );
     if ( empty( $errorMsg ) )
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/serverproperties.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/serverproperties.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/serverproperties.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -171,7 +171,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/servicesproperties.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/servicesproperties.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/servicesproperties.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -136,7 +136,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/unmanageddatamanagement.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/unmanageddatamanagement.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/unmanageddatamanagement.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -113,7 +113,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {
@@ -156,7 +156,7 @@
 {
     CheckForFatalMgException( $e );
     if ( empty( $errorMsg ) )
-        $errorMsg = $e->GetMessage();
+        $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/usermanagement.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/usermanagement.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/usermanagement.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -97,7 +97,7 @@
     catch ( MgException $e )
     {
         CheckForFatalMgException( $e );
-        $errorMsg = $e->GetMessage();
+        $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {
@@ -120,7 +120,7 @@
     {
         CheckForFatalMgException( $e );
         if ( empty( $errorMsg ) )
-            $errorMsg = $e->GetMessage();
+            $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/userrolemanagement.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/userrolemanagement.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/userrolemanagement.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -125,7 +125,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {
@@ -160,7 +160,7 @@
 {
     CheckForFatalMgException( $e );
     if ( empty( $errorMsg ) )
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/viewcurrentlog.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/viewcurrentlog.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/viewcurrentlog.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -41,7 +41,7 @@
     {
         CheckForFatalMgException( $e );
         if ( empty( $errorMsg ) )
-            $errorMsg = $e->GetMessage();
+            $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/viewcurrentlogbottom.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/viewcurrentlogbottom.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/viewcurrentlogbottom.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -86,7 +86,7 @@
     {
         CheckForFatalMgException( $e );
         if ( empty( $errorMsg ) )
-            $errorMsg = $e->GetMessage();
+            $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/viewcurrentlogtop.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/viewcurrentlogtop.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/viewcurrentlogtop.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -90,7 +90,7 @@
     {
         CheckForFatalMgException( $e );
         if ( empty( $errorMsg ) )
-            $errorMsg = $e->GetMessage();
+            $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/viewserverstatus.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/viewserverstatus.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/viewserverstatus.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -37,7 +37,7 @@
     {
         CheckForFatalMgException( $e );
         if ( empty( $errorMsg ) )
-            $errorMsg = $e->GetMessage();
+            $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/viewserverstatusbottom.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/viewserverstatusbottom.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/viewserverstatusbottom.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -248,7 +248,7 @@
     {
         CheckForFatalMgException( $e );
         if ( empty( $errorMsg ) )
-            $errorMsg = $e->GetMessage();
+            $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/viewserverstatustop.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/viewserverstatustop.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/viewserverstatustop.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -63,7 +63,7 @@
     {
         CheckForFatalMgException( $e );
         if ( empty( $errorMsg ) )
-            $errorMsg = $e->GetMessage();
+            $errorMsg = $e->GetExceptionMessage();
     }
     catch ( Exception $e )
     {

Modified: trunk/MgDev/Web/src/mapadmin/wfsproperties.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/wfsproperties.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/wfsproperties.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -58,7 +58,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapadmin/wmsproperties.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/wmsproperties.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapadmin/wmsproperties.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -58,7 +58,7 @@
 catch ( MgException $e )
 {
     CheckForFatalMgException( $e );
-    $errorMsg = $e->GetMessage();
+    $errorMsg = $e->GetExceptionMessage();
 }
 catch ( Exception $e )
 {

Modified: trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp	2010-04-07 20:31:02 UTC (rev 4755)
@@ -354,7 +354,7 @@
                                     new Integer( scriptCmdIndex ) };
             cmdObject = MessageFormat.format("commands[{0,number,integer}] = new InvokeScriptCommand(\"{1}\", {2,number,integer}, \"{3}\", \"{4}\", \"{5}\", \"{6}\", {7,number,integer});\n", formatArgs);
 
-            userCode = userCode + "\nfunction UserFunc" + scriptCmdIndex + "()\n{\n" + invokeScriptCmd.GetCode() + "\n}\n";
+            userCode = userCode + "\nfunction UserFunc" + scriptCmdIndex + "()\n{\n" + invokeScriptCmd.GetScriptCode() + "\n}\n";
             Object[] formatArgs2 = { new Integer(scriptCmdIndex), new Integer(scriptCmdIndex) };
             userCodeCalls = userCodeCalls + MessageFormat.format("case {0,number,integer}: UserFunc{0,number,integer}(); break;\n", formatArgs2);
 
@@ -539,7 +539,7 @@
 }
 catch(MgException e)
 {
-    String msg = EscapeForHtml(e.GetMessage());
+    String msg = EscapeForHtml(e.GetExceptionMessage());
     response.getWriter().write(msg);
     response.setContentLength(msg.length());
 }

Modified: trunk/MgDev/Web/src/mapviewerjava/search.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/search.jsp	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewerjava/search.jsp	2010-04-07 20:31:02 UTC (rev 4755)
@@ -258,7 +258,7 @@
             // Close the feature reader
             features.Close();
         }
-        OnError(searchError, ae.GetMessage() + "<br>" + ae.GetStackTrace(), outStream, request);
+        OnError(searchError, ae.GetExceptionMessage() + "<br>" + ae.GetStackTrace(), outStream, request);
     }
     catch(SearchError exc)
     {

Modified: trunk/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewerjava/serveradminhelper.jsp	2010-04-07 20:31:02 UTC (rev 4755)
@@ -142,7 +142,7 @@
     }
     catch (MgException mge)
     {
-        outStream.write(mge.GetMessage());
+        outStream.write(mge.GetExceptionMessage());
         outStream.write(mge.GetDetails());
     }
 

Modified: trunk/MgDev/Web/src/mapviewerjava/taskframe.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/taskframe.jsp	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewerjava/taskframe.jsp	2010-04-07 20:31:02 UTC (rev 4755)
@@ -85,7 +85,7 @@
     }
     catch (MgException exc)
     {
-        OnError(MgLocalizer.GetString("TASKS", locale), exc.GetMessage(), response.getWriter(), request);
+        OnError(MgLocalizer.GetString("TASKS", locale), exc.GetExceptionMessage(), response.getWriter(), request);
         return;
     }
     catch (Exception ne)

Modified: trunk/MgDev/Web/src/mapviewernet/buffer.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/buffer.aspx	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewernet/buffer.aspx	2010-04-07 20:31:02 UTC (rev 4755)
@@ -358,7 +358,7 @@
     }
     catch (MgException exc)
     {
-        OnError(MgLocalizer.GetString("BUFFERERROR", locale), exc.GetMessage());
+        OnError(MgLocalizer.GetString("BUFFERERROR", locale), exc.GetExceptionMessage());
         return;
     }
     catch (Exception ne)

Modified: trunk/MgDev/Web/src/mapviewernet/mainframe.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/mainframe.aspx	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewernet/mainframe.aspx	2010-04-07 20:31:02 UTC (rev 4755)
@@ -357,7 +357,7 @@
                     StrEscape(invokeScriptCmd.GetDescription(), false),
                     scriptCmdIndex);
 
-                userCode = userCode + "\nfunction UserFunc" + scriptCmdIndex + "()\n{\n" + invokeScriptCmd.GetCode() + "\n}\n";
+                userCode = userCode + "\nfunction UserFunc" + scriptCmdIndex + "()\n{\n" + invokeScriptCmd.GetScriptCode() + "\n}\n";
                 userCodeCalls = userCodeCalls + String.Format("case {0}: UserFunc{1}(); break;\n", scriptCmdIndex, scriptCmdIndex);
 
                 scriptCmdIndex++;

Modified: trunk/MgDev/Web/src/mapviewernet/measure.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/measure.aspx	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewernet/measure.aspx	2010-04-07 20:31:02 UTC (rev 4755)
@@ -218,7 +218,7 @@
         }
         catch (MgException exc)
         {
-            OnError(MgLocalizer.GetString("MEASUREERROR", locale), exc.GetMessage());
+            OnError(MgLocalizer.GetString("MEASUREERROR", locale), exc.GetExceptionMessage());
             return;
         }
         catch (Exception ne)

Modified: trunk/MgDev/Web/src/mapviewernet/search.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/search.aspx	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewernet/search.aspx	2010-04-07 20:31:02 UTC (rev 4755)
@@ -247,7 +247,7 @@
                 // Close the feature reader
                 features.Close();
             }
-            OnError(searchError, ae.GetMessage() + "<br>" + ae.GetStackTrace());
+            OnError(searchError, ae.GetExceptionMessage() + "<br>" + ae.GetStackTrace());
         }
         catch (SearchError exc)
         {

Modified: trunk/MgDev/Web/src/mapviewernet/serveradminhelper.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/serveradminhelper.aspx	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewernet/serveradminhelper.aspx	2010-04-07 20:31:02 UTC (rev 4755)
@@ -130,7 +130,7 @@
     }
     catch (MgException mge)
     {
-        Response.Write(mge.GetMessage());
+        Response.Write(mge.GetExceptionMessage());
         Response.Write(mge.GetDetails());
     }
 }

Modified: trunk/MgDev/Web/src/mapviewernet/taskframe.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/taskframe.aspx	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewernet/taskframe.aspx	2010-04-07 20:31:02 UTC (rev 4755)
@@ -89,7 +89,7 @@
     }
     catch (MgException exc)
     {
-        OnError(MgLocalizer.GetString("TASKS", locale), exc.GetMessage());
+        OnError(MgLocalizer.GetString("TASKS", locale), exc.GetExceptionMessage());
         return;
     }
     catch (Exception ne)

Modified: trunk/MgDev/Web/src/mapviewerphp/capturerequest.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/capturerequest.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewerphp/capturerequest.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -114,7 +114,7 @@
         }
         catch (SqliteException $s)
         {
-            print $s->GetMessage('eng');
+            print $s->GetExceptionMessage('eng');
         }
     }
 

Modified: trunk/MgDev/Web/src/mapviewerphp/createlayer.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/createlayer.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewerphp/createlayer.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -79,7 +79,7 @@
 }
 catch (MgException $e)
 {
-    $errorMsg = EscapeForHtml($e->GetMessage());
+    $errorMsg = EscapeForHtml($e->GetExceptionMessage());
     echo $errorMsg;
 }
 ?>

Modified: trunk/MgDev/Web/src/mapviewerphp/legend.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/legend.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewerphp/legend.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -106,7 +106,7 @@
     }
     catch(MgException $e)
     {
-        $errorMsg = EscapeForHtml($e->GetMessage());
+        $errorMsg = EscapeForHtml($e->GetExceptionMessage());
         $traceMsg = EscapeForHtml($e->GetStackTrace());
         echo $errorMsg . "<p>" . $traceMsg;
         return;

Modified: trunk/MgDev/Web/src/mapviewerphp/mainframe.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/mainframe.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewerphp/mainframe.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -99,7 +99,7 @@
         }
         catch(MgException $e)
         {
-            $shortError = $e->GetMessage();
+            $shortError = $e->GetExceptionMessage();
             $longErrorMsg = EscapeForHtml($e->GetDetails());
             header("HTTP/1.1 559 ");
             header('Content-Type: text/html; charset=utf-8');
@@ -362,7 +362,7 @@
                                         StrEscape($cmd->GetDescription()),
                 $scriptCmdIndex);
 
-                $userCode = $userCode . "\nfunction UserFunc" . $scriptCmdIndex . "()\n{\n". $cmd->GetCode() . "\n}\n";
+                $userCode = $userCode . "\nfunction UserFunc" . $scriptCmdIndex . "()\n{\n". $cmd->GetScriptCode() . "\n}\n";
                 $userCodeCalls = $userCodeCalls . sprintf("case %d: UserFunc%d(); break;\n", $scriptCmdIndex, $scriptCmdIndex);
 
                 $scriptCmdIndex++;
@@ -525,7 +525,7 @@
         // This should be a 500 error of some sort, but
         // in order to give a nice custom error message, it looks as
         // if we shortcut things by using a 200 status.
-        $shortError = $e->GetMessage();
+        $shortError = $e->GetExceptionMessage();
         $longErrorMsg = EscapeForHtml($e->GetDetails());
         header("HTTP/1.1 200 ");
         header('Content-Type: text/html; charset=utf-8');

Modified: trunk/MgDev/Web/src/mapviewerphp/serveradminhelper.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/serveradminhelper.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/mapviewerphp/serveradminhelper.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -123,7 +123,7 @@
     }
     catch (MgException $e)
     {
-         print $e->GetMessage('eng');
+         print $e->GetExceptionMessage('eng');
          print $e->GetDetails('eng');
     }
 ?>

Modified: trunk/MgDev/Web/src/schemareport/displayschema.php
===================================================================
--- trunk/MgDev/Web/src/schemareport/displayschema.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/schemareport/displayschema.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -123,7 +123,7 @@
             }
             catch (MgException $e)
             {
-                $errorMsg = $e->GetMessage();
+                $errorMsg = $e->GetExceptionMessage();
                 $errorMsg = str_replace('\n', '<br>', $errorMsg);
                 echo $errorMsg;
             }

Modified: trunk/MgDev/Web/src/schemareport/main.php
===================================================================
--- trunk/MgDev/Web/src/schemareport/main.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/schemareport/main.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -53,7 +53,7 @@
             }
             catch (MgException $e)
             {
-                echo $e->GetMessage();
+                echo $e->GetExceptionMessage();
             }
         ?>
 

Modified: trunk/MgDev/Web/src/schemareport/showclass.php
===================================================================
--- trunk/MgDev/Web/src/schemareport/showclass.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/schemareport/showclass.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -156,7 +156,7 @@
             }
             catch (MgException $e)
             {
-                echo $e->GetMessage();
+                echo $e->GetExceptionMessage();
             }
 
         ?>

Modified: trunk/MgDev/Web/src/schemareport/showgeom.php
===================================================================
--- trunk/MgDev/Web/src/schemareport/showgeom.php	2010-04-07 19:38:08 UTC (rev 4754)
+++ trunk/MgDev/Web/src/schemareport/showgeom.php	2010-04-07 20:31:02 UTC (rev 4755)
@@ -198,7 +198,7 @@
             catch (MgException $mge)
             {
                 $validSession = 0;
-                echo $mge->GetMessage();
+                echo $mge->GetExceptionMessage();
             }
             catch (Exception $e)
             {



More information about the mapguide-commits mailing list