Changeset 112 for branches/beta/castlib1/thisMoviesScript.ls

Timestamp:

01/16/08 10:27:16 (4 years ago)

Author:

alex

Message:

transferred bugfixes from trunk version

File:

• branches/beta/castlib1/thisMoviesScript.ls (modified) (6 diffs)

branches/beta/castlib1/thisMoviesScript.ls

@@ -87 +87 @@
   
   
+  -- cache the results in order to avoid parsing the same script over and over
+  pCachedResults = xscr().mGetGlobalValue(#pCachedResults)
+  if ilk(pCachedResults) <> #proplist then
+    pCachedResults = [:]
+    xscr().mSetGlobalValue(#pCachedResults, pCachedResults)
+  end if
   
   ---------------- menu divider for better readability:
@@ -108 +114 @@
         if memref.type = #script then
           
-          thisScriptList = mGetScriptHandlerList(memref, kw, searchmode, len)
+          thisScriptList = mGetScriptHandlerList(memref, kw, searchmode, len, pCachedResults)
           
           if count(thisScriptList) > 0 then
@@ -248 +254 @@
 -- get a list of all handlers which pass through the filter if any, in the format we need for the menu
 
-on mGetScriptHandlerList memref, kw, searchmode, len
+on mGetScriptHandlerList memref, kw, searchmode, len, pCachedResults
   
   scrtext = string(memref.scripttext)
@@ -262 +268 @@
     
     if len < 1 then
+      
+      ----------- 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
+      
       -- 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
+      
+      
       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))
@@ -279 +288 @@
         end if
       end if
+      
     end if
     if found <> 1 then
       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
@@ -366 +372 @@
 end
 
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-on _____________________PROCESS_COMMAND
-end
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
--- process the command, which was chosen
--- at this point the command string is stored in the gloabllist, as we come here in an asynch process -> MUI dialog
--- the command and the paramaters are stored in the global list which we get with: call(#mGetGlobalList, mGetXScript())
--------- the command string is glob.getaprop(#cmd)
--------- the parameters are in glob.getaprop(#theParams)
-
-
-on mDoCmd dto, dto2
-  
-  if ilk(dto) = #timeout then dto.forget()
-  if ilk(dto2) = #timeout then dto2.forget()
-  
-  global gRetVal
-  glob = call(#mGetGlobalList, mGetXScript())
-  
-  skipFirstSpace = 0
-  
-  inst = glob.getaprop(#theTargetInstance)
-  if ilk(inst) = #instance then
-    theMemberName = glob.getaprop(#theMemberName)
-    if glob.getaprop(#copy2ClipBoard) = 2 then
-      
-      ----------- alex syntax (I have my own "global handler" to create scriptinstances differently):
-      --      dostr = "call(#" & symbol(glob.getaprop(#cmd)) & ", mGetXscript(#" & theMemberName & "),"
-      if string(theMemberName) = "commonMovieScript" then
-        dostr = "xscr()." & glob.getaprop(#cmd) & "("
-      else
-        dostr = "xscr(#" & theMemberName & ")." & glob.getaprop(#cmd) & "("
-      end if
-      skipFirstSpace = 1
-      del = 0
-    else if glob.getaprop(#copy2ClipBoard) = 1 then
-      ----------- standard syntax, create new script instance for each call (this is NOT the optimized way !)
-      dostr = "call(#" & symbol(glob.getaprop(#cmd)) & ", new(script " & QUOTE & theMemberName & QUOTE & "),"
-      
-      ----------- better: store the intsance in a variable and reuse it (you will need to delete the new(script foo) lines)
-      --      dostr = "theScriptInstance = new(script " & QUOTE & theMemberName & QUOTE & ")" & RETURN & "call(#" & symbol(glob.getaprop(#cmd)) & ", theScriptInstance,"
-      del = 1
-    else
-      dostr = "call(#" & symbol(glob.getaprop(#cmd)) & ", [inst],"
-      del = 1
-    end if
-    
-  else
-    
-    if glob.getaprop(#isBehavior) = 1 then
-      theParams = glob.getaprop(#theParams)
-      sprnum = theParams.getaprop("spritenum")
-      if length(string(sprnum)) < 1 then
-        sprnum = 0
-      else if not(integerP(integer(sprnum))) then
-        sprnum = QUOTE & sprnum & QUOTE
-      end if
-      theParams.deleteprop("spritenum")
-      
-      dostr = "sendSprite(" & sprnum & ", #" & glob.getaprop(#cmd) & ","
-      del = 1
-    else
-      dostr = glob.getaprop(#cmd) & "("
-      skipFirstSpace = 1
-      del = 0
-    end if
-  end if
-  
-  theParams = glob.getaprop(#theParams)
-  if theParams.count then
-    repeat with thisParam in theParams
-      
-      theVal = value(thisParam)
-      if voidP(theVal) then
-        if (string(thisParam)).word.count > 0 then
-          if skipFirstSpace = 1 then
-            put QUOTE&thisParam&QUOTE&"," after dostr
-            skipFirstSpace = 0
-          else
-            put " "&QUOTE&thisParam&QUOTE&"," after dostr
-          end if
-        else
-          put " void," after dostr
-        end if
-        
-      else
-        if length(string(thisParam)) > 0 then
-          if skipFirstSpace = 1 then
-            put thisParam&"," after dostr
-            skipFirstSpace = 0
-          else
-            put " "&thisParam&"," after dostr
-          end if
-        else
-          put " void," after dostr
-        end if
-        
-      end if
-      
-      del = 1
-      
-    end repeat
-    
-  end if
-  if del then delete the last char of dostr
-  
-  put ")" after dostr
-  
-  if (glob.getaprop(#copy2ClipBoard) = 1) or (glob.getaprop(#copy2ClipBoard) = 2) then
-    put "theResult = " before dostr
-    
-    member("pastefeld").text = dostr
-    copyToClipBoard(member("pastefeld"))
-    
-  else
-    
-    tell the stage
-      res = the result
-      do dostr
-      if the result <> res then
-        gRetVal = the result
-        if (string(gRetVal)).length < 100 then put gRetVal
-        else put "Too many chars to put in the message window. Get the result from the global variable gRetVal"&RETURN&"put gRetVal"&RETURN
-      end if
-    end tell
-  end if
-  
-end