Changeset 113 for trunk/lingosource

Timestamp:

01/16/08 10:29:35 (4 years ago)

Author:

alex

Message:

previous bugfix didn't work must defer this bug with a workaround now

Location:

trunk/lingosource/castlib1

Files:

• doCommandMovieScript.ls (modified) (2 diffs)
• memberInfo.xml (modified) (2 diffs)
• thisMoviesScript.ls (modified) (2 diffs)

trunk/lingosource/castlib1/doCommandMovieScript.ls

@@ -11 +11 @@
 
 ---- This handler used to be in "thisMovieScript", but due to a scope bug with calling handlers in other movies -> tell the stage
+-- unfortunately this doesn't fix the problem. have to investiaget later WHY... so calling handlers, which are in this movie will fail
 
 
 on mDoCmd dto, dto2
+  
+  reservedHandlerList = []
+  repeat with mscriptName in ["doCommandMovieScript", "thisMoviesScript", "convert_Lingo_2_CSS_Html"]
+    li = (script mscriptName).handlers()
+    if listP(li) then
+      repeat with n = count(li) down to 1
+        reservedHandlerList.add(string(li[n]))
+      end repeat
+    end if
+  end repeat
   
   if ilk(dto) = #timeout then dto.forget()
@@ -118 +129 @@
   else
     
-    if glob.getaprop(#cmd) = "mDoCmd" then
-      alert "Sorry due to a bug in director I can't call mDoCmd"
+    if reservedHandlerList.getPos(string(symbol(glob.getaprop(#cmd)))) > 0 then
+      alert "Sorry due to a bug in director I can't call handlers, which appear in moviescripts of this tool miaw themselves: " & glob.getaprop(#cmd)
       exit
     end if

trunk/lingosource/castlib1/memberInfo.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <Untitled>
+        <doCommandMovieScript>
+                <scriptType>#movie</scriptType>
+                <comments></comments>
+                <memberName>doCommandMovieScript</memberName>
+                <fName>doCommandMovieScript</fName>
+        </doCommandMovieScript>
         <thisMoviesScript>
                 <scriptType>#movie</scriptType>
@@ -127 +133 @@
                 <fName>custom_Utilities</fName>
         </custom_Utilities>
-        <doCommandMovieScript>
-                <scriptType>#movie</scriptType>
-                <comments></comments>
-                <memberName>doCommandMovieScript</memberName>
-                <fName>doCommandMovieScript</fName>
-        </doCommandMovieScript>
 </Untitled>

trunk/lingosource/castlib1/thisMoviesScript.ls

@@ -273 +273 @@
     if len < 1 then
       
-      -- we cache only the results, if there is no search word
-      -- otherwise we would need to cache the result for every different searchword
-      
-      --      pCachedResults = xscr().mGetGlobalValue(#pCachedResults)
-      --      if ilk(pCachedResults) <> #proplist then
-      --        pCachedResults = [:]
-      --        xscr().mSetGlobalValue(#pCachedResults, pCachedResults)
-      --      end if
+      ----------- unfortunately the modified date doesn't work at all so we can't cache by modified date
+      ----------- we cache instead by scripttext length, which will fail only if the bad chance happens,
+      ----------- that the modification is exactly the same length as the original
       
       cached = pCachedResults.getaprop(string(memref))
       if ilk(cached) = #proplist then
         theDate = cached.getaprop(#theDate)
-        if theDate = memref.modifiedDate then
+        -- if theDate = memref.modifiedDate then
+        if theDate = scrtext.length then
           found = 1
           thisScriptList.setaprop(#items, cached.getaprop(#items))
@@ -296 +292 @@
       found = mParseScriptText(scrtext, theItems, defaultItem, kw, searchmode, len)
       if len < 1 then
-        
-        --        pCachedResults = xscr().mGetGlobalValue(#pCachedResults)
-        --        if ilk(pCachedResults) <> #proplist then
-        --          pCachedResults = [:]
-        --        xscr().mSetGlobalValue(#pCachedResults, pCachedResults)
-        --      end if
-        
-        
-        pCachedResults.setaprop(string(memref), [#theDate:memref.modifiedDate, #items:duplicate(theItems)])
+        -- pCachedResults.setaprop(string(memref), [#theDate:memref.modifiedDate, #items:duplicate(theItems)])
+        pCachedResults.setaprop(string(memref), [#theDate:scrtext.length, #items:duplicate(theItems)])
       end if
     end if