Changeset 108 for trunk/lingosource

Timestamp:

01/16/08 09:03:56 (4 years ago)

Author:

alex

Message:

fixed a bug where mGetGlobalList was called in the wrong scope

File:

• trunk/lingosource/castlib1/thisMoviesScript.ls (modified) (5 diffs)

trunk/lingosource/castlib1/thisMoviesScript.ls

@@ -101 +101 @@
   savelist = [:]
   
+  
+  -- list to cache results for every different searchword
+  pCachedResults = xscr().mGetGlobalValue(#pCachedResults)
+  if ilk(pCachedResults) <> #proplist then
+    pCachedResults = [:]
+    xscr().mSetGlobalValue(#pCachedResults, pCachedResults)
+  end if
+  
+  
+  
   tell the stage
     
@@ -108 +118 @@
         if memref.type = #script then
           
-          thisScriptList = mGetScriptHandlerList(memref, kw, searchmode, len)
+          thisScriptList = mGetScriptHandlerList(memref, kw, searchmode, len, pCachedResults)
           
           if count(thisScriptList) > 0 then
@@ -248 +258 @@
 -- 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 +272 @@
     
     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
+      
+      --      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
@@ -281 +294 @@
     end if
     if found <> 1 then
-    found = mParseScriptText(scrtext, theItems, defaultItem, kw, searchmode, len)
+      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 = 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)])
       end if