Changeset 1019 for trunk/plugins/en/output_NUMBER.tcl

Timestamp:

08/23/09 19:22:05 (3 years ago)

Author:

james

Message:

New output parser for core plugins - should fix problems with late replacements getting missed

File:

• trunk/plugins/en/output_NUMBER.tcl (modified) (4 diffs)

trunk/plugins/en/output_NUMBER.tcl

@@ -1 @@
-#
-#
 # vim: fdm=indent fdn=1
 #
@@ -6 +4 @@
 ###############################################################################
 # This is a bMotion plugin
-# Copyright (C) James Michael Seward 2000-2008
+# Copyright (C) James Michael Seward 2000-2009
 #
 # This program is covered by the GPL, please refer the to LICENCE file in the
@@ -21 +19 @@
         bMotion_putloglev 4 * "bMotion_plugin_output_NUMBER $channel $line"
 
-        set lastline ""
-
         set padding 0
-        while {[regexp "%NUMBER\{(\[0-9\]+)\}(\{(\[0-9\]+)\})?" $line matches numberString paddingOpt padding]} {
+        if {[regexp "%NUMBER\{(\[0-9\]+)\}(\{(\[0-9\]+)\})?" $line matches numberString paddingOpt padding]} {
                 set var [bMotion_get_number [bMotion_rand_nonzero $numberString]]
                 if {$padding > 0} {
@@ -33 +29 @@
                 set line [bMotionInsertString $line "%NUMBER\\{$numberString\\}(\\{\[0-9\]+\\})?" $var]
                 set padding 0
-
-                if {$lastline == $line} {
-                        putlog "bMotion: ALERT! unable to process %NUMBER in $line (dropping output)"
-                        set line ""
-                        break
-                }
-                set lastline $line
         }