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

Timestamp:

Jan 31, 2006, 9:15:36 AM (19 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/rpLibXml.cc (modified) (3 diffs)

trunk/src/matlab/rpLibXml.cc

@@ -28 +28 @@
                  int nrhs, const mxArray *prhs[])
 {
-    const char* output_buf = NULL;
     int libIndex = 0;
     int err = 1;
     RpLibrary* lib = NULL;
+    std::string retStr = "";
 
     /* Check for proper number of arguments. */
-    if (nrhs != 1)
+    if (nrhs != 1) {
         mexErrMsgTxt("One input required.");
-    else if (nlhs > 2)
-        mexErrMsgTxt("Too many output arguments.");
+    }
 
     // grab the integer value of the library handle
@@ -46 +45 @@
         lib = getObject_Lib(libIndex);
         if (lib) {
-            output_buf = rpXml(lib);
-            if (output_buf) {
+            retStr = lib->xml();
+            if (!retStr.empty()) {
                 err = 0;
             }
@@ -54 +53 @@
 
     /* Set C-style string output_buf to MATLAB mexFunction output*/
-    plhs[0] = mxCreateString(output_buf);
+    plhs[0] = mxCreateString(retStr.c_str());
     plhs[1] = mxCreateDoubleScalar(err);