Changeset 962 for trunk/src/matlab

Timestamp:

Mar 25, 2008 12:19:50 PM (15 years ago)

Author:

dkearney

Message:

code cleanups.
adjusted gague.tcl to check the length of the string it receives for integers and reals.
modified c, matlab, and octave's lib function to handle empty string for creation of empty library.
modified matlab and octave's lib result function to handle status as a parameter.
fixed core library code to deal with incorrect order of translating xml entity references.

Location:

trunk/src/matlab

Files:

• rpLib.cc (modified) (1 diff)
• rpLibResult.cc (modified) (4 diffs)

trunk/src/matlab/rpLib.cc

@@ -40 +40 @@
 
     /* Call the C++ subroutine. */
-    if (!path.empty()) {
-        lib = new RpLibrary(path);
-        if (lib) {
-            // store the library and return a dictionary key
-            libIndex = storeObject_Lib(lib);
-            if (libIndex) {
-                err = 0;
-            }
+    lib = new RpLibrary(path);
+    if (lib) {
+        // store the library and return a dictionary key
+        libIndex = storeObject_Lib(lib);
+        if (libIndex) {
+            err = 0;
         }
     }

trunk/src/matlab/rpLibResult.cc

@@ -17 +17 @@
 
 /**********************************************************************/
-// METHOD: [err] = rpLibResult (libHandle)
+// METHOD: [err] = rpLibResult (libHandle,status)
 /// Write Rappture Library to run.xml and signal end of processing.
 /**
@@ -30 +30 @@
     int libIndex = 0;
     int err = 1;
+    int status = 0;
     RpLibrary* lib = NULL;
 
     /* Check for proper number of arguments. */
-    if (nrhs != 1) {
+    if (nrhs > 2) {
+        mexErrMsgTxt("At most two input allowed.");
+    }
+
+    if (nrhs < 1) {
         mexErrMsgTxt("One input required.");
     }
@@ -40 +45 @@
     libIndex = getIntInput(prhs[0]);
 
+    if (nrhs == 2) {
+        status = getIntInput(prhs[1]);
+    }
+
     /* Call the C subroutine. */
     if (libIndex > 0) {
@@ -45 +54 @@
         if (lib) {
             lib->put("tool.version.rappture.language", "matlab");
-            lib->result();
+            lib->result(status);
             err = 0;
             // cleanLibDict();