Changeset 6311 for branches/1.6

Timestamp:

May 4, 2016, 11:24:57 AM (9 years ago)

Author:

gah

Message:

fixes for binary data in putFile, defer loader setting default value

Location:

branches/1.6

Files:

• gui/scripts/loader.tcl (modified) (2 diffs)
• src/core/RpLibrary.cc (modified) (2 diffs)

branches/1.6/gui/scripts/loader.tcl

@@ -246 +246 @@
     set str [string trim [$_owner xml get $path.default]]
     if { $str != "" } {
-        bind $itk_component(hull) <Map> [itcl::code $this SetDefaultValue $str]
+        SetDefaultValue $str
     }
 }
@@ -326 +326 @@
 # SetDefaultValue --
 #
-#       Sets the designated default value for the loader.  This must be done
-#       after the entire application is assembled, otherwise the default
-#       values set up by the loader will be overwritten by the various widgets
-#       themselves when they try to set their default values.
-#
-#       This is called from a  <Map> event to the loader (combobox).  This
-#       will get trigger the first time the loader is displayed.  The binding
-#       is then removed.
+#   Sets the designated default value for the loader.  This must be done
+#   after the entire application is assembled, otherwise the default values
+#   set up by the loader will be overwritten by the various widgets
+#   themselves when they try to set their default values.
+#
+#   This is called from a <Map> event to the loader (combobox).  This will
+#   get trigger the first time the loader is displayed.  The binding is
+#   then removed.
 #
 itcl::body Rappture::Loader::SetDefaultValue { value } {
-    after idle [itcl::code $this value $value]
-    # We're done. Remove the binding.
-    bind $itk_component(hull) <Map> {}
+    after 100 [itcl::code $this value $value]
 }
 

branches/1.6/src/core/RpLibrary.cc

@@ -1791 +1791 @@
 
     // check for binary data
-    // FIXME: I've already appended a NUL-byte of this assuming that
+    // FIXME: I've already appended a NUL-byte to this assuming that
     //        it's a ASCII string. This test must come before.
     if (Rappture::encoding::isBinary(value.c_str(), value.length())) {
@@ -2047 +2047 @@
         return *this;
     }
-    if (compress == RPLIB_COMPRESS) {
+    if ((compress == RPLIB_COMPRESS) ||
+        (Rappture::encoding::isBinary(fileBuf.bytes(), fileBuf.size()))) {      
         putData(path, fileBuf.bytes(), fileBuf.size(), append);
     } else {
-        /* Always append a NUL-byte to the end of ASCII strings. */
         fileBuf.append("\0", 1);
         put(path, fileBuf.bytes(), "", append, RPLIB_TRANSLATE);