Author: remi
Date: 2009-03-29 18:59:48 +0200 (Sun, 29 Mar 2009)
New Revision: 4252

Modified:
   software_suite_v2/tuxware/tuxdroidserver/trunk/TDSResourcesManager.py
   software_suite_v2/tuxware/tuxdroidserver/trunk/data/xsl/web_gadget.xsl
Log:
* added a trick to pass "&" char into a parameter value in a request (Without 
this trick the rest of the request after the char "&" is skipped ...)

Modified: software_suite_v2/tuxware/tuxdroidserver/trunk/TDSResourcesManager.py
===================================================================
--- software_suite_v2/tuxware/tuxdroidserver/trunk/TDSResourcesManager.py       
2009-03-29 11:38:54 UTC (rev 4251)
+++ software_suite_v2/tuxware/tuxdroidserver/trunk/TDSResourcesManager.py       
2009-03-29 16:59:48 UTC (rev 4252)
@@ -600,21 +600,22 @@
             return clientId, resourceName, serviceName, parameters
         if urlString[0] == "?":
             urlString = urlString[1:]
+        urlString = urlString.replace("&&", "#amp;")
         while 1:
             equIdx = urlString.find("=")
             if equIdx == -1:
                 break
-            paramName = urlString[:equIdx]
+            paramName = urlString[:equIdx].replace("#amp;", "&")
             urlString = urlString[equIdx + 1:]
             sepIdx = urlString.find("&")
             if sepIdx == -1:
                 # This is the last parameter
                 paramValue = urlString
-                parameters[paramName] = paramValue
+                parameters[paramName] = paramValue.replace("#amp;", "&")
                 break
             else:
                 paramValue = urlString[:sepIdx]
-                parameters[paramName] = paramValue
+                parameters[paramName] = paramValue.replace("#amp;", "&")
                 urlString = urlString[sepIdx + 1:]
         return clientId, resourceName, serviceName, parameters
 

Modified: software_suite_v2/tuxware/tuxdroidserver/trunk/data/xsl/web_gadget.xsl
===================================================================
--- software_suite_v2/tuxware/tuxdroidserver/trunk/data/xsl/web_gadget.xsl      
2009-03-29 11:38:54 UTC (rev 4251)
+++ software_suite_v2/tuxware/tuxdroidserver/trunk/data/xsl/web_gadget.xsl      
2009-03-29 16:59:48 UTC (rev 4252)
@@ -21,7 +21,7 @@
                     var param = parameters[i];
                     if (param.id == 'internals')
                     {
-                        parametersString += param.name + '=' + param.value + 
'|';
+                        parametersString += param.name + '=' + 
param.value.replace('&', '&&') + '|';
                     }
                 }
                 
@@ -36,7 +36,7 @@
                         }
                         else
                         {
-                            parametersString += param.name + '=' + param.value 
+ '|';
+                            parametersString += param.name + '=' + 
param.value.replace('&', '&&') + '|';
                         }
                     }
                 }
@@ -45,7 +45,7 @@
                 for (var i = 0; i < parameters.length; i++)
                 {
                     var param = parameters[i];
-                    parametersString += param.name + '=' + param.value + '|';
+                    parametersString += param.name + '=' + 
param.value.replace('&', '&&') + '|';
                 }
                 
                 var url = "/gadget_framework/start_gadget_by_uuid?command=";


------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn

Reply via email to