Changeset 962 for trunk/src/octave

Timestamp:

Mar 25, 2008, 12:19:50 PM (17 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/octave

Files:

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

trunk/src/octave/rpLib.cc

@@ -47 +47 @@
         if (args(0).is_string ()) {
             path = args(0).string_value ();
-            if (!path.empty()) {
-                lib = new RpLibrary(path);
+            lib = new RpLibrary(path);
+            if (lib != NULL) {
                 err = 0;
             }

trunk/src/octave/rpLibResult.cc

@@ -6 +6 @@
  *
  * ======================================================================
- *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2005
+ *  AUTHOR:  Derrick S. Kearney, Purdue University
+ *  Copyright (c) 2005-2008
  *  Purdue Research Foundation, West Lafayette, IN
  * ======================================================================
@@ -15 +15 @@
 
 /**********************************************************************/
-// METHOD: [err] = rpLibResult (libHandle)
+// METHOD: [err] = rpLibResult (libHandle,status)
 /// Write Rappture Library to run.xml and signal end of processing.
 /** 
@@ -25 +25 @@
 DEFUN_DLD (rpLibResult, args, ,
 "-*- texinfo -*-\n\
-[err] = rpLibResult (@var{libHandle})\n\
+[err] = rpLibResult (@var{libHandle},@var{status})\n\
 \n\
 Usually the last call of the program, this function signals to the gui\n\
@@ -37 +37 @@
     octave_value_list retval;
 
-    int nargin = args.length ();
+    int nargin = args.length();
     RpLibrary* lib = NULL;
     int libHandle = 0;
+    int status = 0;
     int err = 0;
 
-    if (nargin == 1) {
-        if (args(0).is_real_scalar ()) {
-            libHandle= args(0).int_value ();
-            /* Call the C subroutine. */
-            if (libHandle > 0) {
-                lib = getObject_Lib(libHandle);
-                if (lib) {
-                    lib->put("tool.version.rappture.language", "octave");
-                    lib->result();
-                    // cleanLibDict();
-                    err = 0;
-                }
-            }
+    if ((nargin < 1) || (nargin > 2)) {
+        // wrong number of arguments
+        print_usage ("rpLibResult");
+        goto done;
+    }
+
+    if (! args(0).is_real_scalar()) {
+        // wrong argument type
+        print_usage ("rpLibResult");
+        goto done;
+    }
+
+    libHandle = args(0).int_value();
+
+    if (nargin == 2) {
+        if (! args(1).is_real_scalar()) {
+            // wrong argument type
+            print_usage ("rpLibResult");
+            goto done;
         }
-        else {
-            // wrong argument type
-            print_usage ("rpLib");
+
+        status = args(1).int_value();
+    }
+
+    /* Call the C subroutine. */
+    if (libHandle > 0) {
+        lib = getObject_Lib(libHandle);
+        if (lib) {
+            lib->put("tool.version.rappture.language", "octave");
+            lib->result(status);
+            // cleanLibDict();
+            err = 0;
         }
     }
-    else {
-        // wrong number of arguments
-        print_usage ("rpLib");
-    }
 
+done:
     retval(0) = err;
-
-  return retval;
+    return retval;
 }