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

Timestamp:

03/21/10 11:39:48 (2 years ago)

Author:

alex

Message:

cleanup

File:

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

trunk/lingosource/castlib2/PseudoXMLPS.ls

@@ -24 +24 @@
 --              -- Convert a list to an xml string:
 --              xmlString = PseudoXMLPS.mGetXMLStringFromList(["one", "two", [#prop: 3]])
---              lingolist = PseudoXMLPS.mGetListFromXMLStringX(xmlString)
+--              lingolist = PseudoXMLPS.mGetListFromXMLString(xmlString)
 --              ---------- basically that's it
 --
@@ -40 +40 @@
 -- xmlString = PseudoXMLPS.mGetXMLStringFromList(myList, "myList", 1, 1)
 -- ...
--- myList = PseudoXMLPS.mGetListFromXMLStringX(xmlString)
+-- myList = PseudoXMLPS.mGetListFromXMLString(xmlString)
 -- repeat with n = countmyList) down to 1
 --   thisValue = myList[n]
@@ -79 +79 @@
 on _____________________PROPERTY_DECLARATION me
 end
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+property ancestor
 property pXMLParserXtra
 property pXmlxtraversion, pVersionNumber
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-on ___________PUBLIC_EVENTS me
+on ___________________STANDARD_EVENTS me
 end
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
 on new me
+  Script_Root_Object = member("Script_Root_Object")
+  if ilk(Script_Root_Object) = #member then
+    if Script_Root_Object.type = #script then
+      ancestor = new(script "Script_Root_Object")
+      mSetScriptName me, "PseudoXMLPS"
+    end if
+  end if
   return me
 end
 
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+on ___________________ENGINE_EVENTS me
+end
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
@@ -99 +110 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
+on ___________PUBLIC_EVENTS me
+end
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
 -- on handler me
@@ -117 +130 @@
   
   put RETURN & "----- Parse XML-ish string to lingo list" after str
-  put RETURN & "on mGetListFromXMLString me, string_XMLstring, integer_convertValues" after str
+  put RETURN & "on mGetListFromXMLStringlingo me, string_XMLstring, integer_convertValues" after str
   put RETURN & "-- -- <convertValues> #integer" after str
   put RETURN & "-- -- -- 0 => don't convert (fast, all values are strings)" after str
@@ -126 +139 @@
   
   put RETURN & "----- Parse XML string to lingo list using XML xtra:" after str
-  put RETURN & "on mGetListFromXMLStringX me, string_XMLstring, integer_convertValues" after str
+  put RETURN & "on mGetListFromXMLString me, string_XMLstring, integer_convertValues" after str
   put RETURN & "-- -- <convertValues> #integer" after str
   put RETURN & "-- -- -- 0 => don't convert (fast, all values are strings)" after str
@@ -205 +218 @@
 
 
-on mGetListFromXMLString me, str, convertValues, withParams
+on mGetListFromXMLStringlingo me, str, convertValues, withParams
   -----------------------------------
   -- CREATED: 06.03.2008
@@ -214 +227 @@
   --          <withParams> : #boolean : parse parameters too. new, not very well tested
   -- RETURNS: property list
-  -- EXAMPLE: lingo_list = mGetListFromXMLString(me, saveString)
+  -- EXAMPLE: lingo_list = mGetListFromXMLStringlingo(me, saveString)
   -- CHANGES: implemented parameter parsing
   -----------------------------------
@@ -250 +263 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
+-- this is just backward compatibility with older scripts
 
 on mGetListFromXMLStringX me, str, convertValues, withParams
+  return mGetListFromXMLString(me, str, convertValues, withParams)
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mGetListFromXMLString me, str, convertValues, withParams
   -----------------------------------
   -- CREATED: 06.03.2008
@@ -265 +284 @@
   --           -- -- 2 => try to convert all data with value(), even parse for colors in hexstring format (slow)
   -- RETURNS: property list
-  -- EXAMPLE: lingo_list = mGetListFromXMLStringX(me, saveString)
+  -- EXAMPLE: lingo_list = mGetListFromXMLString(me, saveString)
   -- CHANGES: resorts to the slower lingo function on xml parser error. So this handler can always be used.
   -----------------------------------
@@ -310 +329 @@
   end if
   
-  if pXmlxtraversion < 10 then return mGetListFromXMLString(me, str, convertValues, withParams)
+  if pXmlxtraversion < 10 then return mGetListFromXMLStringlingo(me, str, convertValues, withParams)
   ------------------ end XML Parser xtra version 10 check
   
@@ -329 +348 @@
   end if
   
+  
   if not(objectP(pXMLParserXtra)) then pXMLParserXtra = new(xtra "XmlParser")
   pXMLParserXtra.parseString(str)
   
   if not(voidP(pXMLParserXtra.getError())) then
-    put "Script: PseudoXMLPS; Handler: mGetListFromXMLStringX; error:" && pXMLParserXtra.getError()
-    return mGetListFromXMLString(me, str, convertValues, withParams)
+    put "Script: PseudoXMLPS; Handler: mGetListFromXMLString; error:" && pXMLParserXtra.getError()
+    return mGetListFromXMLStringlingo(me, str, convertValues, withParams)
   end if
   
@@ -341 +361 @@
   li = mConvertXMLPropList(me, [xx], convertValues, dontEscapeSpecialChars)
   
-  -- put "PseudoXMLPS: mGetListFromXMLStringX:" && the milliseconds - ms
+  -- put "PseudoXMLPS: mGetListFromXMLString:" && the milliseconds - ms
   
   if not(listP(li)) then return [:]
@@ -363 +383 @@
   
   dertext = xscr(#FileIOFunktionen).mGetTextFromFile(thePath, void, "windows-1252")
-  if length(dertext) > 0 then return mGetListFromXMLStringX(me, dertext)
+  if length(dertext) > 0 then return mGetListFromXMLString(me, dertext)
   return [:]
 end
@@ -1230 +1250 @@
 
 on mGetListFromPListString me, str
-  return mConvertKeyList(me, mGetListFromXMLStringX(me, str, 0))
+  return mConvertKeyList(me, mGetListFromXMLString(me, str, 0))
 end
 
@@ -1329 +1349 @@
     end repeat
   end repeat
-  
   
   zehn = numToChar(10)