Changeset 1041 for trunk/modules/abstract.tcl

Timestamp:

10/16/09 14:59:20 (3 years ago)

Author:

james

Message:

support multiple filters per abstract

File:

• trunk/modules/abstract.tcl (modified) (8 diffs)

trunk/modules/abstract.tcl

@@ -136 +136 @@
   global bMotionModules bMotion_testing bMotion_loading
   global bMotionInfo bMotion_abstract_languages bMotion_abstract_dir
-        global bMotion_abstract_last_get
+        global bMotion_abstract_last_get bMotion_abstract_filters
 
   #set timestamp to now
@@ -142 +142 @@
   set lang $bMotionInfo(language)
         set bMotion_abstract_last_get($abstract) ""
+        set bMotion_abstract_filters($abstract) ""
 
   #load any existing abstracts
@@ -508 +509 @@
 proc bMotion_abstract_revive_language { } {
   global bMotionSettings bMotionInfo bMotionModules
-  global bMotion_abstract_contents bMotionLocal
-
-  set lang $bMotionInfo(language)
+  global bMotion_abstract_contents bMotionLocal bMotion_abstract_filters
+
+  set lang $bMotionInfo(language)
+
 
   bMotion_putloglev 2 * "bMotion: reviving language ($lang) abstracts"
@@ -582 +584 @@
 
 # filter out stuff from an abstract
-proc bMotion_abstract_filter { abstract filter_text } {
+proc bMotion_abstract_filter { abstract filter } {
         global bMotion_abstract_contents bMotion_abstract_ondisk
 
@@ -596 +598 @@
 
         if {[llength $contents] == 0} {
-                bMotion_putloglev d * "can't get contents for $abstract"
+                if {$abstract != "_all"} {
+                        bMotion_putloglev d * "can't get contents for $abstract"
+                }
                 return
         }
@@ -605 +609 @@
         foreach element $contents {
                 bMotion_putloglev 2 * "considering $element for filtering"
-                if [regexp $filter_text $element] {
-                        bMotion_putloglev 1 * "abstract $abstract element $element matches filter, dropping"
-                        continue
-                }
-                lappend new_contents $element
+                set do_filter 0
+                foreach filter_text $filter {
+                        if {(!$do_filter) && [regexp $filter_text $element]} {
+                                bMotion_putloglev 1 * "abstract $abstract element $element matches filter $filter_text, dropping"
+                                set do_filter 1
+                        }
+                }
+                if {!$do_filter} {
+                        lappend new_contents $element
+                }
         }
 
         set new_size [llength $new_contents]
   set diff [expr $initial_size - $new_size]
-        bMotion_putloglev d * "abstract $abstract reduced by $diff items with filter $filter_text"
+        bMotion_putloglev d * "abstract $abstract reduced by $diff items with filter $filter"
 
         if {$diff > 0} {
@@ -635 +644 @@
 
         bMotion_abstract_filter $abstract $filter
+        catch {
+                set filter $bMotion_abstract_filter(_all)
+                bMotion_abstract_filter $abstract $filter
+        }
 }
 
@@ -641 +654 @@
         global bMotion_abstract_filters
 
-        set bMotion_abstract_filters($abstract) $filter_text
+        lappend bMotion_abstract_filters($abstract) $filter_text
+
         bMotion_putloglev d * "registered filter /$filter_text/ for abstract $abstract"