Changeset 605 for trunk

Timestamp:

Mar 3, 2007 10:18:41 AM (17 years ago)

Author:

dkearney

Message:

fixed function name for octave put file function
added more error checking in rappture library core for put file functions
adjusted argument list for perl's put file function
added error checking to rapptue buffer

Location:

trunk

Files:

• perl/Rappture.xs (modified) (1 diff)
• src/core/RpLibrary.cc (modified) (3 diffs)
• src/octave/rpLibPutFile.cc (modified) (1 diff)
• src2/core/RpBuffer.cc (modified) (1 diff)

trunk/perl/Rappture.xs

@@ -58 +58 @@
 
 void
-RpLibrary::putFile( path, fileName, fileType, append )
+RpLibrary::putFile( path, fileName, compress, append )
 char *path
 char *fileName
-int fileType
+int compress
 int append
         CODE:
-                THIS->putFile(path,fileName,fileType,append);
+                THIS->putFile(path,fileName,compress,append);
 
 void

trunk/src/core/RpLibrary.cc

@@ -1587 +1587 @@
     Rappture::Buffer buf;
     Rappture::Buffer fileBuf;
+    Rappture::Outcome err;
     unsigned int bytesWritten = 0;
     std::string value = "";
@@ -1605 +1606 @@
                 if (compress == RPLIB_COMPRESS) {
                     // base64 decode and un-gzip the data
-                    buf.decode();
+                    err = buf.decode();
+                    if (err) {
+                        // decompress and decode failed, return err
+                        return *this;
+                    }
                 }
             }
@@ -1616 +1621 @@
         if (compress == RPLIB_COMPRESS) {
             // gzip and base64 encode the data
-            buf.encode();
+            err = buf.encode();
+            if (err) {
+                // compress and encode failed, return error
+                return *this;
+            }
         }
         else {

trunk/src/octave/rpLibPutFile.cc

@@ -32 +32 @@
  */
 
-DEFUN_DLD (rpLibPutString, args, ,
+DEFUN_DLD (rpLibPutFile, args, ,
 "-*- texinfo -*-\n\
-[err] = rpLibPutString(@var{libHandle},@var{path},@var{fileName},@var{compress},@var{append})\n\
+[err] = rpLibPutFile(@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\

trunk/src2/core/RpBuffer.cc

@@ -623 +623 @@
     if (compress) {
         do_compress(err,*this,bout);
+        if (err) {
+            return err;
+        }
     }