Changeset 597 for trunk/src/octave

Timestamp:

Mar 1, 2007 11:24:02 AM (17 years ago)

Author:

dkearney

Message:

adjusted core makefile to not remove setup.py when doing a make clean
adjusted putFile and putData commands and flags in matlab, octave,fortran,perl
changed the RPLIB_[TEXT,BINARY] flags to RPLIB_COMPRESS and RPLIB_NO_COMPRESS flags
adjusted the c-example for compress to incorporate newly named flags.
adjusted rappture library header to find rappture buffer header files in rappture2 directory.

Location:

trunk/src/octave

Files:

• rpLibPutData.cc (added)
• rpLibPutFile.cc (modified) (7 diffs)

trunk/src/octave/rpLibPutFile.cc

@@ -3 +3 @@
  *  INTERFACE: Octave Rappture Library Source
  *
- *    [err] = rpLibPutFile(libHandle,path,fileName,fileType,append)
+ *    [err] = rpLibPutFile(libHandle,path,fileName,compress,append)
  *
  * ======================================================================
@@ -25 +25 @@
  *
  * FileName is the name of the file to import into the rappture object
- * FileType is an integer representing the type of file to include, text
- * (use 0) or binary (use 1).
+ * Compress is an integer telling if the provided data should be compressed
+ * (use 1) or left uncompressed (use 0).
  * Append is an integer telling if this new data should overwrite
  * (use 0) or be appended (use 1) to previous data in this node.
@@ -34 +34 @@
 DEFUN_DLD (rpLibPutString, args, ,
 "-*- texinfo -*-\n\
-[err] = rpLibPutString(@var{libHandle},@var{path},@var{value},@var{append})\n\
+[err] = rpLibPutString(@var{libHandle},@var{path},@var{fileName},@var{compress},@var{append})\n\
 \n\
 Clients use this to set the value of a node.  If the @var{path}\n\
 is not specified (ie. empty string ""), it sets the value for the\n\
 root node.  Otherwise, it sets the value for the element specified\n\
-by the path.  The @var{value} is treated as the text within the \n\
+by the path.  The added data is treated as the text within the \n\
 tag at the tail of the @var{path}.\n\
 \n\
 @var{fileName} is the name of the file to import into the rappture object\n\
-@var{fileType} is an integer representing the type of file to include, text\n\
-(use 0) or binary (use 1).\n\
+@var{compress} is an integer telling if the provided data should be compressed\n\
+(use 1) or left uncompressed (use 0).\n\
 @var{append} is an integer telling if this new data should overwrite\n\
 (use 0) or be appended (use 1) to previous data in this node.\n\
@@ -50 +50 @@
 Error Codes: err = 0 is success, anything else is failure.")
 {
-    static std::string who = "rpLibPutString";
+    static std::string who = "rpLibPutFile";
 
     // The list of values to return.
@@ -59 +59 @@
     std::string path      = "";
     std::string fileName  = "";
-    unsigned int fileType = 0;
+    unsigned int compress = 0;
     unsigned int append   = 0;
     RpLibrary* lib        = NULL;
 
-    if (nargin == 4) {
+    if (nargin == 5) {
 
         if ( args(0).is_real_scalar() &&
@@ -69 +69 @@
              args(2).is_string()      &&
              args(3).is_real_scalar() &&
-             args(3).is_real_scalar()   ) {
+             args(4).is_real_scalar()   ) {
 
             libHandle = args(0).int_value ();
             path      = args(1).string_value ();
             fileName  = args(2).string_value ();
-            fileType  = (unsigned int) args(3).int_value ();
-            append    = (unsigned int) args(3).int_value ();
+            compress  = (unsigned int) args(3).int_value ();
+            append    = (unsigned int) args(4).int_value ();
 
             /* Call the C subroutine. */
@@ -84 +84 @@
                 lib = getObject_Lib(libHandle);
                 if (lib) {
-                    lib->putFile(path,fileName,fileType,append);
+                    lib->putFile(path,fileName,compress,append);
                     err = 0;
                 }