Changeset 1036 for trunk/plugins/en/output_VAR.tcl

Timestamp:

09/11/09 18:08:35 (3 years ago)

Author:

james

Message:

fixed logic error

File:

• trunk/plugins/en/output_VAR.tcl (modified) (2 diffs)

trunk/plugins/en/output_VAR.tcl

@@ -122 +122 @@
                                         bMotion_putloglev 1 * "pluralising $replacement"
                                         set replacement [bMotionMakePlural $replacement]
+                                        putlog $replacement
                                 }
                                 "owner" {
@@ -133 +134 @@
                                 }
                         }
-
-                        # actually do the replacement
-                        regsub $whole_thing $line $replacement line
+                        bMotion_putloglev 1 * "current replacement is $replacement"
                 }
 
-                if {[llength $options_list] == 0} {
-                        regsub $whole_thing $line $replacement line
+                set location [string first $whole_thing $line]
+                if {$location == -1} {
+                        # something's broken
+                        putlog "bMotion: error parsing $whole_thing in $line, unable to insert $replacement"
+                        return ""
                 }
+                set line [string replace $line $location [expr $location + [string length $matches] - 1] $replacement]
 
                 # check if what we swapped in gave us a %noun