Changeset 163 for trunk

Timestamp:

04/06/08 11:11:43 (4 years ago)

Author:

alex

Message:

now with version checking

Location:

trunk/lingosource

Files:

• castlib1/memberInfo.xml (modified) (1 diff)
• castlib1/showHideHelp.ls (modified) (1 diff)
• castlib1/subversion_version_field.txt (added)
• castlib2/FileIOFunktionen.ls (modified) (4 diffs)
• castlib2/GetSetPrefs.ls (modified) (3 diffs)
• castlib2/PseudoXMLPS.ls (modified) (11 diffs)
• castlib2/aleXtrasMovieScript.ls (modified) (7 diffs)
• castlib2/commonMovieScript.ls (modified) (8 diffs)
• castlib2/memberInfo.xml (modified) (1 diff)
• castlib2/subversionVersionChecker.ls (added)
• castlib2/subversionVersionChecker.png (added)

trunk/lingosource/castlib1/memberInfo.xml

@@ -133 +133 @@
                 <fname>custom_Utilities</fname>
         </custom_Utilities>
+        <subversion_version_field>
+                <scriptType>#field</scriptType>
+                <comments>http://www.farbflash.de/cgi-bin/versionChecker.pl?movieName=HandlerMenu_OSC</comments>
+                <memberName>subversion_version_field</memberName>
+                <fname>subversion_version_field</fname>
+        </subversion_version_field>
 </Untitled>

trunk/lingosource/castlib1/showHideHelp.ls

@@ -11 +11 @@
   else
     sprite(me.spritenum).member = member("show_help")
-    (the activewindow).rect = rect(r.left, r.top, r.right, r.top + sprite(xscr().mGetkanal(#helpTextSprite)).rect.top)
+    (the activewindow).rect = rect(r.left, r.top, r.right, r.top + sprite(xscr().mGetkanal(#helpTextSprite)).rect.top - 10)
     if (label("withoutSearch") <> marker(0)) then go "withoutSearch"
   end if

trunk/lingosource/castlib2/FileIOFunktionen.ls

@@ -63 +63 @@
   if not(internetLink) then internetLink = (fname starts "www.")
   if the runmode contains "plugin" or internetLink then
-    scr = xscr().mGetInstance("NetLingoManagerPS__")
-    if ilk(scr) = #instance then
-      scr.mStartNetOP(paramList)
-    else
+    --    scr = xscr().mGetInstance("NetLingoManagerPS__")
+    --    if ilk(scr) = #instance then
+    --      scr.mStartNetOP(paramList)
+    --    else
       scr = xscr().mGetInstance("NetTextReaderPS")
     if ilk(scr) = #instance then
@@ -75 +75 @@
       call(paramList.getaprop(#handler), [paramList.getaprop(#target)], paramList)
     end if
-    end if
+    --    end if
   else
     paramList.setaprop(#theTextResult, mGetTextFromFile(me, paramList.getaprop(#theURL)))
@@ -385 +385 @@
       retval = fx.fx_FolderToList(folderpath)
       delim = the last char of the moviepath
-      if length(delim) < 1 then delim = the last char of the applicationpath
+      if length(delim) < 1 then
+        if not(the runmode contains "plug") then
+          delim = the last char of the applicationpath
+        end if
+      end if
       if length(delim) < 1 then delim = "/"
       repeat with n = count(retval) down to 1
@@ -426 +430 @@
       retval = fx.fx_FolderToList(folderpath)
       delim = the last char of the moviepath
-      if length(delim) < 1 then delim = the last char of the applicationpath
+      if length(delim) < 1 then
+        if not(the runmode contains "plug") then
+          delim = the last char of the applicationpath
+        end if
+      end if
       if length(delim) < 1 then delim = "/"
       repeat with n = count(retval) down to 1

trunk/lingosource/castlib2/GetSetPrefs.ls

@@ -177 +177 @@
   
   if offset("<?xml", prefsText.line[1]) > 0 then
-    delete line 1 of prefsText
-    
-    gPrefs = call(#mGetListFromXMLString, [mGetXScript(#PseudoXMLPS)], prefsText)
-    if ilk(gPrefs) = #proplist then globs[#gPrefs] = gPrefs
+--    delete line 1 of prefsText
+    
+    gPrefs = call(#mGetListFromXMLString, mGetXScript(#PseudoXMLPS), prefsText)
+    if objectP(gPrefs) then globs[#gPrefs] = gPrefs
     
   else
@@ -324 +324 @@
   
   if useAleXML then
-    prefStr = call(#mGetXMLStringFromList, [mGetXScript(#PseudoXMLPS)], prefliste, prefsname)
+    prefStr = call(#mGetXMLStringFromList, mGetXScript(#PseudoXMLPS), prefliste, prefsname)
     --    put "<? alexml ?>"&RETURN before prefStr
     -- put "<?xml version="&QUOTE&"1.0"&QUOTE&"?>"&RETURN before prefStr
@@ -335 +335 @@
     repeat with n = 1 to anz
       
-      if ilk(prefliste) = #proplist then prefStr = string(prefliste.getPropAt(n))&"À"
+      if objectP(prefliste) then prefStr = string(prefliste.getPropAt(n))&"À"
       
       dieserWert = prefliste[n]

trunk/lingosource/castlib2/PseudoXMLPS.ls

@@ +1 @@
+-- PseudoXMLPS
+-----------------------------------
+-- CREATED:
+-- 06.03.2008
+--
+-- DESCRIPTION:
 -- Pseudo XML by Alex da Franca ©2003
 -- Convert a lingo list to a XML like string and back
 
--- alex am Freitag 21.April.2006 16:31:57
---------------------------------------------------------
--- fixed a bug in "mBuildXMLString" many thanks to Olaf Schliesing for pointing this out
-
--- alex am 28.11.06 um 16:41:00
---------------------------------------------------------
--- finally added a tag property, when writing xml, so the ilk of the object gets stored
--- so, when reading back the xml file, we do not convert a node by accident to a value
--- when a string evaluates to a value "by accident"
-
----------------------------------
--- Scriptmarker: changes alex (04.04.2007 at 10:22 Uhr) // Scriptmarker
--- added  escaping of: 
---                     & -> &
---                     ' -> '
---                     " -> "
--- and vice versa. Until now I only escaped < and >, but ampersand, apostrophe and quote must also be escaped for proper xml
-
--- I als added "support" for the CData tag, which allows you to escape the whole contents of a node.
--- support is only done through ignoring esaping the special characters, wehn BUILDING the xml string.
--- So the user can decide on his own, which nodes s/he wants to be masked inside a CData section
--- (otherwise I'd have to mask EVERY string and try to unmask EVERY node. Now the user is on his own)
-
--- Example:
+--
+-- REQUIRES:
+-- (Prerequisites)
+--
+-- USAGE:
 -- myList = [#stringWithInvalidChars:"A string with invalid chars like <> and & and ' and " & QUOTE]
 -- myList[#stringWithInvalidChars] = "<![CDATA[" & myList[#stringWithInvalidChars] & "]]>"
@@ -41 +28 @@
 --   end if
 -- end repeat
+--
+-- HISTORY:
+
+--              alex am Freitag 21.April.2006 16:31:57
+--              fixed a bug in "mBuildXMLString" many thanks to Olaf Schliesing for pointing this out
+--
+--              alex am 28.11.06 um 16:41:00
+--              finally added a tag property, when writing xml, so the ilk of the object gets stored
+--              so, when reading back the xml file, we do not convert a node by accident to a value
+--              when a string evaluates to a value "by accident"
+--
+--              Scriptmarker: changes alex (04.04.2007 at 10:22 Uhr) // Scriptmarker
+--              added  escaping of: 
+--                                   & -> &amp;
+--                                   ' -> &apos;
+--                                   " -> &quot;
+--              and vice versa. Until now I only escaped < and >, but ampersand, apostrophe and quote must also be escaped for proper xml
+--              I als added "support" for the CData tag, which allows you to escape the whole contents of a node.
+--              support is only done through ignoring esaping the special characters, wehn BUILDING the xml string.
+--              So the user can decide on his own, which nodes s/he wants to be masked inside a CData section
+--              (otherwise I'd have to mask EVERY string and try to unmask EVERY node. Now the user is on his own)
+-- TODO:
+-- -
+-----------------------------------
+
+
+
+
+
+
 
 
@@ -112 +129 @@
 -- xxxxxxxxxxxxxxxxxx Convert lingo list (also nested lists) to XML stylish string
 
--- Parameters:
+on mGetXMLStringFromList me, listref, docName, strict, dontReplaceGT, withParams
+  -----------------------------------
+  -- CREATED: 06.03.2008
+  -- ACTION: Convert lingo list (also nested lists) to XML stylish string
+  -- INPUT: 
 -- <listref> format: property list or linear list
 -- <docName> format: #string; optional. if omitted "Untitled" is used for the XML document name
--- strict        => boolean; avoid spaces in tag names
--- dontReplaceGT => boolean; dont replace < and >
--- withParams    => boolean; write attribute in tag for the lingo ilk => bigger xml files and unfortunately it is slower to parse
+  --              <strict>        => boolean; avoid spaces in tag names
+  --              <dontReplaceGT> => boolean; dont replace < and >
+  --              <withParams>    => boolean; write attribute in tag for the lingo ilk => bigger xml files and unfortunately it is slower to parse
 ----------------------------- (I thought avoiding value() would help, but in this case the additional text parsing of the attributes tag slows down)
-
--- Example:
--- saveString = mGetXMLStringFromList(me, lingo_list, "documentName")
-
-on mGetXMLStringFromList me, listref, docName, strict, dontReplaceGT, withParams
+  -- RETURNS: string
+  -- EXAMPLE: saveString = mGetXMLStringFromList(me, lingo_list, "documentName")
+  -----------------------------------
+  
   --  ms = the milliseconds
   if voidP(strict) then strict = 0
@@ -152 +172 @@
 -- xxxxxxxxxxxxxxxxxx Convert XML stylish string to lingo list
 
--- Parameters:
+
+on mGetListFromXMLString me, str, convertValues, withParams
+  -----------------------------------
+  -- CREATED: 06.03.2008
+  -- ACTION: Description
+  -- INPUT:
 -- <str> format: #string; split a string using <> and </> tags into lingo list
 -- <convertValues> #integer 0=>don't convert (fast, all values are strings), 1 => convert only numbers (slower); 2 => try to convert all data, even colors (slow)
-
--- Example:
--- lingo_list = mGetListFromXMLString(me, saveString)
-
-on mGetListFromXMLString me, str, convertValues, withParams
+  --          <withParams> : #boolean : parse parameters too. new, not very well tested
+  -- RETURNS: property list
+  -- EXAMPLE: lingo_list = mGetListFromXMLString(me, saveString)
+  -- CHANGES: implemented parameter parsing
+  -----------------------------------
   
   ms = the milliseconds
@@ -193 +218 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
--- MUCH FASTER than the above: Use the XML xtra to parse the string
--- BUT it must be a valid xml string, the above is slower but allows more malformed xml
-
--- Parameters:
+
+
+property pXmlxtraversion
+
+on mGetListFromXMLStringX me, str, convertValues, withParams
+  -----------------------------------
+  -- CREATED: 06.03.2008
+  -- ACTION: Convert xml string to lingo list using the xmlparser xtra, if possible
+  --         MUCH FASTER than the above: Use the XML xtra to parse the string
+  --         BUT it must be a valid xml string, the above is slower but allows more malformed xml
+  -- INPUT: 
 -- <str> format: #string; split a string using <> and </> tags into lingo list
 -- <convertValues> #integer
@@ -202 +234 @@
 -- -- -- 1 => convert only integer() and float() (slower)
 -- -- -- 2 => try to convert all data with value(), even parse for colors in hexstring format (slow)
-
--- Example:
--- lingo_list = mGetListFromXMLStringX(me, saveString)
-
-property pXmlxtraversion
-
-on mGetListFromXMLStringX me, str, convertValues, withParams
+  -- RETURNS: property list
+  -- EXAMPLE: lingo_list = mGetListFromXMLStringX(me, saveString)
+  -- CHANGES: resorts to the slower lingo function on xml parser error. So this handler can always be used.
+  -----------------------------------
   
   if ilk(str) <> #string then str = string(str)
@@ -289 +318 @@
   
 end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+on _______________READ_WRITE_EXTERNAL_FILES
+end
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mReadXML_2_List me, thePath
+  -----------------------------------
+  -- CREATED: 06.03.2008
+  -- ACTION: read external xml file to lingo list
+  -- INPUT: <thePath> : string ; optional pathname. if no pathname or "", then a file save dialog is shown
+  -- RETURNS: property list
+  -----------------------------------
+  
+  dertext = xscr(#FileIOFunktionen).mGetTextFromFile(thePath)
+  if length(dertext) > 0 then return xscr(#PseudoXMLPS).mGetListFromXMLStringX(dertext)
+  return [:]
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSaveList_2_XML me, theList, thePath
+  -----------------------------------
+  -- CREATED: 06.03.2008
+  -- ACTION: write liongo list to external xml file
+  -- INPUT: 
+  --          <theList> : linear or property list
+  --          <thePath> : string ; optional pathname. if no pathname or "", then a file selection dialog is shown
+  -- RETURNS: full pathname of newly created file, if successful, otherwise 0
+  -----------------------------------
+  
+  if not(listP(theList)) then return 0
+  theResult = xscr(#PseudoXMLPS).mGetXMLStringFromList(theList)
+  return xscr(#FileIOFunktionen).mSaveToTextFile(theResult, thePath)
+end
+
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -940 +1005 @@
         
         if ilk(retlist) = #proplist then
-          retlist.addProp(symbol(inputlist[n].getaprop(#name)), val)
+        retlist.addProp(symbol(inputlist[n].getaprop(#name)), val)
         else
           retlist.add(val)
@@ -994 +1059 @@
                         
                       else
-                        call(#mPut, [mGetXScript(#commonmoviescript)], "mParseExcelXML: Row "&n&" Cell "&m&" is not a property list")
+                        call(#mPut, mGetXScript(), "mParseExcelXML: Row "&n&" Cell "&m&" is not a property list")
                       end if -- if ilk(thisCell) = #proplist then
                       
@@ -1000 +1065 @@
                     
                   else
-                    call(#mPut, [mGetXScript(#commonmoviescript)], "mParseExcelXML: Row "&n&" is not a list")
+                    call(#mPut, mGetXScript(), "mParseExcelXML: Row "&n&" is not a list")
                   end if -- if listP(currRow) then
                   
@@ -1006 +1071 @@
                 
               else
-                call(#mPut, [mGetXScript(#commonmoviescript)], "mParseExcelXML: Table not found")
+                call(#mPut, mGetXScript(), "mParseExcelXML: Table not found")
               end if -- if listP(xmlList) then
               
             else
-              call(#mPut, [mGetXScript(#commonmoviescript)], "mParseExcelXML: Worksheet not found")
+              call(#mPut, mGetXScript(), "mParseExcelXML: Worksheet not found")
             end if -- if ilk(xmlList) = #proplist then
             
           else
-            call(#mPut, [mGetXScript(#commonmoviescript)], "mParseExcelXML: Workbook not found")
+            call(#mPut, mGetXScript(), "mParseExcelXML: Workbook not found")
           end if -- if ilk(xmlList) = #proplist then
           
         else
-          call(#mPut, [mGetXScript(#commonmoviescript)], "mParseExcelXML: ROOT is not a property list")
+          call(#mPut, mGetXScript(), "mParseExcelXML: ROOT is not a property list")
         end if --if ilk(xmlList) = #proplist then
         
       else
-        call(#mPut, [mGetXScript(#commonmoviescript)], "mParseExcelXML: Xml parser makelist() returned empty list")
+        call(#mPut, mGetXScript(), "mParseExcelXML: Xml parser makelist() returned empty list")
       end if -- if count(xmlList) > 0 then
       
     else
-      call(#mPut, [mGetXScript(#commonmoviescript)], "mParseExcelXML: Xml parser makelist() failed")
+      call(#mPut, mGetXScript(), "mParseExcelXML: Xml parser makelist() failed")
     end if -- if listP(xmlList) then
     
   else
-    call(#mPut, [mGetXScript(#commonmoviescript)], "mParseExcelXML: Xml parser error: "&xmlp.getError())
+    call(#mPut, mGetXScript(), "mParseExcelXML: Xml parser error: "&xmlp.getError())
   end if -- if voidP(xmlp.getError()) then
   

trunk/lingosource/castlib2/aleXtrasMovieScript.ls

@@ -18 +18 @@
 -----------------------------------
 
-
 property pAleXtras
 
 on mGetAleXtras
   
+  alextras = (script "aleXtrasMovieScript").pAleXtras
+  if not(objectP(alextras)) then
+    alextras = new(script "commonMovieScript")
+    if ilk(alextras) <> #instance then
+      alert "HandlerMenu: Script" & QUOTE & "commonMovieScript" & QUOTE && "is missing. This movie can't proceed!"
+      halt
+    end if
+    (script "aleXtrasMovieScript").pAleXtras = alextras
+  end if
+  return alextras
+  -----------------------------
   
   alextras = (script "aleXtrasMovieScript").pAleXtras
@@ -61 +71 @@
   -----------------------------------
   
+  alextras = mGetAleXtras()
+  scrName = string(scrName)
+  if length(scrName) < 1 then return alextras
+  if scrName = "commonMovieScript" then return alextras
+  
+  inst = alextras.mGetInstance(scrName, 1)
+  if ilk(inst) <> #instance then
+    if the runmode contains "aut" then
+      put "HandlerMenu: Script" && QUOTE & scrName & QUOTE && "is missing! This may cause unwanted behavior"
+    end if
+      inst = []
+    end if
+  return inst
+  ----------------------
+  
+  
   scrName = symbol(scrName)
   if ilk(scrName) <> #symbol then scrName = #commonmoviescript
@@ -99 +125 @@
   --         TODO: -
   -----------------------------------
+  exit
+  
   
   mediaList = mGetAleXtras()
@@ -144 +172 @@
 on mLoadXScript whichName
   
+  exit
+  
+  
   whichName = string(whichName)
   if length(whichName) < 1 then return 0
@@ -168 +199 @@
 
 on mLoadScriptsFromLDM whichSprite
+  
+  cms = xscr()
+  globs = cms.mGetGlobalList()
+  includes = globs[#gParentScriptInstances]
+  if not(objectP(includes)) then
+    includes = [:]
+    globs[#gParentScriptInstances] = includes
+  end if
+  
+  tell sprite(whichSprite)
+    cl = the number of castlibs
+    repeat with n = 1 to cl
+      num = the number of members of castlib cl
+      repeat with m = 1 to num
+        mem = member(m,n)
+        if length(mem.name) > 0 then
+          if mem.type = #script then
+            includes.setaProp(mem.name, mem.script)
+          end if
+        end if
+      end repeat
+    end repeat
+  end tell
+  
+  exit
+  ------------------------------
   
   mediaList = mGetAleXtras()
@@ -204 +261 @@
 
 on mListAleXtras
+  put "Handler mListAleXtras deprecated"
+  exit
+  
   alextras = (script "aleXtrasMovieScript").pAleXtras
   if voidP(alextras) then mLoadScripts
@@ -253 +313 @@
   sel = the selection of castlib cl
   
-  delim = the last char of the applicationpath
+  
+  mp = the moviepath
+  if length(mp) < 1 then
+    if the runmode contains "plug" then
+      mp = "/"
+    else
+      mp = the applicationpath
+    end if
+  end if
+  delim = the last char of mp
   
   the itemdelimiter = "/"

trunk/lingosource/castlib2/commonMovieScript.ls

@@ -91 +91 @@
     pGList = [:]
     scr = mGetXScript(#regisx)
-    if not voidP(scr) then
+    if not listP(scr) then
       if mCheckForXtra(me, "BudAPI") = 1 then call(#regisb, scr)
       if mCheckForXtra(me, "vList") = 1 then call(#regisv, scr)
@@ -496 +496 @@
 on mGetThisMovieName me
   glob = mGetGlobalList(me)
-  return string(glob.getaprop(#movieIdentifier))
+  str = string(glob.getaprop(#movieIdentifier))
+  if length(str) > 0 then return str
+  str = mSplitPath(me, the moviename).basename
+  mSetThisMovieName me, str
+  return str
 end
 
@@ -1196 +1200 @@
 -- xxxxxxxxxxxxxxxxxx stored script instances:
 
-on mGetInstance me, instName
+on mGetInstance me, instName, useRawNew
+  
   theGlobs = mGetGlobalList(me)
   gParentScriptInstances = theGlobs.getaprop(#gParentScriptInstances)
@@ -1209 +1214 @@
   
   if mGetMemType(me, member(instName)) = #script then
-    saveScr = new(script instName)
+    if useRawNew = 1 then saveScr = rawnew(script instName)
+    else saveScr = new(script instName)
     gParentScriptInstances.setaprop(instName, saveScr)
     return saveScr
   end if
   
-  
+  if saveScr = -1 then return 0
+  gParentScriptInstances.setaprop(instName, -1)
   inst = mGetXScript(symbol(instName))
-  if objectP(inst) then
-    saveScr = new(inst)
+  if not(listP(inst)) then
+    if ilk(inst) = #instance then inst = inst.script
+    if useRawNew = 1 then saveScr = rawnew(inst)
+    else saveScr = new(inst)
     gParentScriptInstances.setaprop(instName, saveScr)
     return saveScr
@@ -1356 +1365 @@
     delim =  the last char of the moviepath
     if length(delim) < 1 then
-      delim = the last char of the applicationpath
+      
+      if the runmode contains "plug" then
+        delim = "/"
+      else
+        delim = the last char of the applicationpath
+      end if
+      
+      
       if length(delim) < 1 then delim = "/"
     end if
@@ -1396 +1412 @@
     mp = the moviepath
     if length(mp) < 1 then
+      if the runmode contains "plug" then
+        mp = ""
+      else
       mp = the applicationpath
+      end if
       if length(mp) < 1 then
         mp = "@/"
@@ -1412 +1432 @@
     delim =  the last char of the moviepath
     if length(delim) < 1 then
-      delim = the last char of the applicationpath
+      
+      if the runmode contains "plug" then
+        mp = ""
+      else
+        delim = the last char of the applicationpath
+      end if
+      
+      
       if length(delim) < 1 then delim = "/"
     end if
@@ -1482 +1509 @@
     delim = the last char of the moviepath
     if length(delim) < 1 then
-      delim = the last char of the applicationpath
+      if not(the runmode contains "plug") then
+        delim = the last char of the applicationpath
+      end if
       if length(delim) < 1 then delim = "/"
     end if

trunk/lingosource/castlib2/memberInfo.xml

@@ -43 +43 @@
                 <fname>SpriteNameBeaver</fname>
         </SpriteNameBeaver>
+        <subversionVersionChecker>
+                <scriptType>#score</scriptType>
+                <comments>~/Documents/Scripts/lingo/subversionVersionChecker.ls</comments>
+                <memberName>subversionVersionChecker</memberName>
+                <fname>subversionVersionChecker</fname>
+        </subversionVersionChecker>
 </Untitled>