Changeset 1042 for trunk/lang/tcl/scripts/library.tcl

Timestamp:

Jun 10, 2008, 6:52:04 PM (16 years ago)

Author:

mmc

Message:

Fixed the Rappture::encoding::encode and decode operations to honor "--".
This is handy when the string may start with a dash, as in:

Rappture::encoding::encode -- -hi

Fixed the library.tcl code to guard against encode/decode problem by
using the "--" in front of strings obtained from the xml.

Cleaned up the tests for the Rappture::LibraryObj? class. Everything
works properly now, except for units. Some of the tests are failing
because the units code reports "length" instead of "area" (test finds
this problem). This should be fixed in the units code.

File:

• trunk/lang/tcl/scripts/library.tcl (modified) (5 diffs)

trunk/lang/tcl/scripts/library.tcl

@@ -347 +347 @@
     }
     set node [$node parentNode]
+    if {$node == ""} {
+        return ""
+    }
 
     switch -- $params(-as) {
@@ -453 +456 @@
       }
       default {
-          error "bad flavor \"$params(-as)\": should be component, id, object, type"
+          error "bad flavor \"$params(-as)\": should be component, id, object, path, type"
       }
     }
@@ -502 +505 @@
     }
     if {$params(-decode) == "yes"} {
-        return [Rappture::encoding::decode [string trim [$node text]]]
+        return [Rappture::encoding::decode -- [string trim [$node text]]]
     } else {
         return [string trim [$node text]]
@@ -543 +546 @@
         }
     }
-    if {[llength $args] > 2} {
+    if {[llength $args] < 1 || [llength $args] > 2} {
         error "wrong # args: should be \"put ?-append bval? ?-id num? ?-type string|file? ?-compress bval? ?path? string\""
     }
@@ -563 +566 @@
 
     if {$params(-compress) || [Rappture::encoding::is binary $str]} {
-        set str [Rappture::encoding::encode $str]
+        set str [Rappture::encoding::encode -- $str]
     }