Changeset 150 for trunk/lingosource/castlib2/PseudoXMLPS.ls

Timestamp:

02/18/08 06:02:53 (4 years ago)

Author:

alex

Message:

update library scripts

File:

• trunk/lingosource/castlib2/PseudoXMLPS.ls (modified) (8 diffs)

trunk/lingosource/castlib2/PseudoXMLPS.ls

@@ -251 +251 @@
   end if
   
-  if pXmlxtraversion < 10 then return mGetListFromXMLString(me, str, convertValues)
+  if pXmlxtraversion < 10 then return mGetListFromXMLString(me, str, convertValues, withParams)
   ------------------ end XML Parser xtra version 10 check
   
@@ -275 +275 @@
   if not(voidP(xt.getError())) then
     put "Script: PseudoXMLPS; Handler: mGetListFromXMLStringX; error:" && xt.getError()
-    return [:]
+    return mGetListFromXMLString(me, str, convertValues, withParams)
   end if
   
   xx = xt.makePropList()
-  li = mConvertXMLPropList(me, [xx], convertValues)
-  
-  --  put the milliseconds - ms
+  dontEscapeSpecialChars = 1 -- we do not need to do this, as the xmlparser xtra already did it for us
+  li = mConvertXMLPropList(me, [xx], convertValues, dontEscapeSpecialChars)
+  
+ -- put "x" && the milliseconds - ms
   
   if not(listP(li)) then return [:]
@@ -843 +844 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mConvertXMLPropList me, inputlist, convertValues
+on mConvertXMLPropList me, inputlist, convertValues, dontEscapeSpecialChars
   retlist = [:]
   anz = count(inputlist)
@@ -860 +861 @@
       if count(val) then
         if ilk(retlist) = #proplist then
-          retlist.addProp(symbol(inputlist[n].getaprop(#name)), mConvertXMLPropList(me, val, convertValues))
-        else
-          retlist.add(mConvertXMLPropList(me, val, convertValues))
+        retlist.addProp(symbol(inputlist[n].getaprop(#name)), mConvertXMLPropList(me, val, convertValues, dontEscapeSpecialChars))
+      else
+          retlist.add(mConvertXMLPropList(me, val, convertValues, dontEscapeSpecialChars))
         end if
       else
@@ -882 +883 @@
               
               -- unescape <>&'"
-              val = mUnEscapeSpecialChars(me, val)
+               if dontEscapeSpecialChars <> 1 then val = mUnEscapeSpecialChars(me, val)
               
             #integer:
@@ -903 +904 @@
               
               -- unescape <>&'"
-              val = mUnEscapeSpecialChars(me, val)
+              if dontEscapeSpecialChars <> 1 then val = mUnEscapeSpecialChars(me, val)
               
             else
@@ -917 +918 @@
               
               -- unescape <>&'"
-              val = mUnEscapeSpecialChars(me, val)
+              if dontEscapeSpecialChars <> 1 then val = mUnEscapeSpecialChars(me, val)
               
             else
@@ -927 +928 @@
             
             -- unescape <>&'"
-            val = mUnEscapeSpecialChars(me, val)
+           if dontEscapeSpecialChars <> 1 then val = mUnEscapeSpecialChars(me, val)