Changeset 162 for trunk/src/matlab/rpLibGet.cc

Timestamp:

Jan 31, 2006 9:15:36 AM (18 years ago)

Author:

dkearney

Message:

changed matlab api to call c++ functions instead of rappture's c api
removed following functions because they are outdated and should not be included at matlab/octave's release
src/octave/rpLibPutDoubleId.cc
src/octave/rpLibPutStringId.cc
src/matlab/rpLibPutDoubleId.cc
src/matlab/rpLibPutStringId.cc
cleaned up makefile to reflect the removal of above functions.
matlab bindings need to be retested. they receive a runtime error about undefined symbols

File:

• trunk/src/matlab/rpLibGet.cc (modified) (2 diffs)

trunk/src/matlab/rpLibGet.cc

@@ -35 +35 @@
     int         err         = 1;
     RpLibrary*  lib         = NULL;
-    char*       path        = NULL;
-    const char* retString   = NULL;
+    std::string path        = "";
+    std::string retStr      = "";
 
     /* Check for proper number of arguments. */
-    if (nrhs != 2)
+    if (nrhs != 2) {
         mexErrMsgTxt("Two input required.");
-    else if (nlhs > 2)
-        mexErrMsgTxt("Too many output arguments.");
+    }
 
     libIndex = getIntInput(prhs[0]);
@@ -48 +47 @@
 
     /* Call the C subroutine. */
-    if ( (libIndex > 0) && (path) ) {
+    if ( (libIndex > 0) && (!path.empty()) ) {
         lib = getObject_Lib(libIndex);
 
         if (lib) {
-            retString = rpGet(lib,path);
-            if (retString) {
-                err = 0;
-            }
+            retStr = lib->get(path);
+            err = 0;
         }
     }
 
     /* Set C-style string output_buf to MATLAB mexFunction output*/
-    plhs[0] = mxCreateString(retString);
+    plhs[0] = mxCreateString(retStr.c_str());
     plhs[1] = mxCreateDoubleScalar(err);