Changeset 3638

Timestamp:

Apr 26, 2013 5:28:07 AM (8 years ago)

Author:

gah

Message:

fix ruby getstring for binary strings

Location:

trunk

Files:

• gui/scripts/vtkheightmapviewer.tcl (modified) (1 diff)
• lang/octave/src/rpLibGetString.cc (modified) (1 diff)
• lang/python/Rappture/PyRpLibrary.cc (modified) (2 diffs)
• lang/ruby/Ruby_Rappture.cc (modified) (1 diff)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -747 +747 @@
             SendCmd "clientinfo [list $info]"
         }
-
         set w [winfo width $itk_component(view)]
         set h [winfo height $itk_component(view)]

trunk/lang/octave/src/rpLibGetString.cc

@@ -41 +41 @@
     octave_value_list retval;
     int err = 1;
-    int nargin = args.length ();
-    std::string path = "";
-    int libHandle = 0;
-    RpLibrary* lib = NULL;
+    int argc;
     std::string retStr = "";
 
-    if (nargin == 2) {
-
-        if (    args(0).is_real_scalar () &&
-                args(1).is_string      ()   ) {
+    argc = args.length();
+    if (argc == 2) {
+        if ((args(0).is_real_scalar()) && (args(1).is_string())) {
+            std::string path;
+            int libHandle;
 
             libHandle = args(0).int_value ();
+
             path = args(1).string_value ();
-
             /* Call the C subroutine. */
             // path can be an empty string
-            if ( (libHandle >= 0) ) {
+            if (libHandle >= 0) {
+                RpLibrary* lib;
 
                 lib = (RpLibrary*) getObject_Void(libHandle);
-
-                if (lib) {
-                    retStr = lib->getString(path);
-                    err = 0;
+                if (lib != NULL) {
+                    retval(0) = lib->getString(path);
+                    retval(1) = 0;
+                    return retval;
                 }
-                else {
-                    // lib was null (not found in dictionary)
-                }
+            } else {
+                // invalid libHandle
+                _PRINT_USAGE(who.c_str());
             }
-            else {
-                // invalid libHandle
-                _PRINT_USAGE (who.c_str());
-            }
+        } else {
+            // wrong arg types
+            _PRINT_USAGE(who.c_str());
         }
-        else {
-            // wrong arg types
-            _PRINT_USAGE (who.c_str());
-        }
+    } else {
+        // wrong number of args.
+        _PRINT_USAGE(who.c_str());
     }
-    else {
-        // wrong number of args.
-        _PRINT_USAGE (who.c_str());
-    }
-
     retval(0) = retStr;
-    retval(1) = err;
+    retval(1) = 1;
     return retval;
 }

trunk/lang/python/Rappture/PyRpLibrary.cc

@@ -471 +471 @@
 {
     char* path = (char *)"";
-
     PyObject* decode = NULL;
     int decodeFlag;
-
-    PyObject* retVal = NULL;
-    std::string retValStr = "";
-    Rappture::Buffer retValBuf;
-
+    PyObject *resultPtr = NULL;
     int argc = 0;
 
@@ -517 +512 @@
     }
     if (decodeFlag) {
-        retValStr = self->lib->get(std::string(path));
-        retVal = PyString_FromStringAndSize(retValStr.c_str(),retValStr.size());
+        std::string s;
+
+        s = self->lib->get(std::string(path));
+        resultPtr = PyString_FromStringAndSize(s.c_str(), s.size());
     } else {
-        retValBuf = self->lib->getData(std::string(path));
-        retVal = PyString_FromStringAndSize(retValBuf.bytes(),retValBuf.size());
-    }
-    return (PyObject *)retVal;
+        Rappture::Buffer out;
+
+        out = self->lib->getData(std::string(path));
+        resultPtr = PyString_FromStringAndSize(out.bytes(), out.size());
+    }
+    return (PyObject *)resultPtr;
 }
 

trunk/lang/ruby/Ruby_Rappture.cc

@@ -87 +87 @@
       
    /* Return a Ruby VALUE */
-   return rb_str_new2(result.c_str());
+   return rb_str_new(result.c_str(), result.length());
 
 }  /* end RbRp_GetString */