Changeset 1022

Timestamp:

08/24/09 06:26:27 (2 years ago)

Author:

james

Message:

Fix bug in new output parser: unknown abstracts caused infinite loop
Make abstract filters case-sensitive
Fix broken abstract which triggered above

Location:

trunk

Files:

• modules/abstract.tcl (modified) (1 diff)
• modules/abstracts/en/abstracts.tcl (modified) (1 diff)
• modules/output.tcl (modified) (1 diff)
• plugins/en/output_VAR.tcl (modified) (1 diff)

trunk/modules/abstract.tcl

@@ -564 +564 @@
         foreach element $contents {
                 bMotion_putloglev 2 * "considering $element for filtering"
-                if [regexp -nocase $filter_text $element] {
+                if [regexp $filter_text $element] {
                         bMotion_putloglev 1 * "abstract $abstract element $element matches filter, dropping"
                         continue

trunk/modules/abstracts/en/abstracts.tcl

@@ -4478 +4478 @@
         "%VAR{captains_log_start}: %channel has arrived at Deep Space %NUMBER{9}."
         "%VAR{captains_log_start}: I've summoned the ops to discuss Commander %ruser's theory that %VAR{sillyThings:strip,plural} are a lifeform. Doctor %ruser has attended reluctantly."
-        "%VAR{captains_log_start}: after placing the modified %VAR{sillythings:strip} on the Romulan ship, we have returned to %channel."
+        "%VAR{captains_log_start}: after placing the modified %VAR{sillyThings:strip} on the Romulan ship, we have returned to %channel."
         "%VAR{captains_log_start}: We are approching %VAR{irc_networks}, where many Bajorans have resettled."
         "%VAR{captains_log_start}: temporary repairs have been completed. Our attention now turns to matters of a more festive nature."
         "%VAR{captains_log_start}: %channel is charting six IRC servers that make up %VAR{irc_networks}, an area being considered for colonisation."
 }
+bMotion_abstract_add_filter "captains_log_sensible" "sillythings"
 
 bMotion_abstract_register "captains_log_silly" {

trunk/modules/output.tcl

@@ -203 +203 @@
                                         }
                                         if {$result == ""} {
+                                                incr current_pos
                                                 continue
                                         }

trunk/plugins/en/output_VAR.tcl

@@ -43 +43 @@
                         }] { 
                                 bMotion_putloglev d * "Unable to handle %VAR{$abstract}"
-                                set line ""
-                                break
+                                return ""
                         }
                 } else {