[mapguide-commits] r4716 - in sandbox/adsk/2.2gp/Web/src: mapviewerjava mapviewerphp

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2010-03-30 06:36:40 -0400 (Tue, 30 Mar 2010)
New Revision: 4716

Modified:
   sandbox/adsk/2.2gp/Web/src/mapviewerjava/mainframe.jsp
   sandbox/adsk/2.2gp/Web/src/mapviewerphp/mainframe.php
Log:
Fix ticket 1292
The mapguide doesn't work against the Java Api, due to the Api update.

Modified: sandbox/adsk/2.2gp/Web/src/mapviewerjava/mainframe.jsp
===================================================================
--- sandbox/adsk/2.2gp/Web/src/mapviewerjava/mainframe.jsp	2010-03-29 18:28:29 UTC (rev 4715)
+++ sandbox/adsk/2.2gp/Web/src/mapviewerjava/mainframe.jsp	2010-03-30 10:36:40 UTC (rev 4716)
@@ -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);
 

Modified: sandbox/adsk/2.2gp/Web/src/mapviewerphp/mainframe.php
===================================================================
--- sandbox/adsk/2.2gp/Web/src/mapviewerphp/mainframe.php	2010-03-29 18:28:29 UTC (rev 4715)
+++ sandbox/adsk/2.2gp/Web/src/mapviewerphp/mainframe.php	2010-03-30 10:36:40 UTC (rev 4716)
@@ -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++;