Changeset 597 for trunk/src/fortran/RpLibraryFInterface.cc

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.

File:

• trunk/src/fortran/RpLibraryFInterface.cc (modified) (3 diffs)

trunk/src/fortran/RpLibraryFInterface.cc

@@ -688 +688 @@
     std::string inPath = "";
     RpLibrary* lib = NULL;
-
-    inPath = null_terminate_str(path,path_len);
-
-    if ((handle) && (*handle != 0)) {
-        lib = getObject_Lib(*handle);
-
-        if (lib) {
-            lib->putData(inPath,bytes,*nbytes,*append);
+    int bufferSize = 0;
+
+    inPath = null_terminate_str(path,path_len);
+
+    if (*nbytes < bytes_len) {
+        bufferSize = *nbytes;
+    }
+    else {
+        bufferSize = bytes_len;
+    }
+
+    if ((handle) && (*handle != 0)) {
+        lib = getObject_Lib(*handle);
+
+        if (lib) {
+            lib->putData(inPath,bytes,bufferSize,*append);
         }
     }
@@ -712 +720 @@
                         char* path,
                         char* fileName,
-                        int* fileType,
+                        int* compress,
                         int* append,
                         int path_len,
@@ -729 +737 @@
 
         if (lib) {
-            lib->putFile(inPath,inFileName,*fileType,*append);
+            lib->putFile(inPath,inFileName,*compress,*append);
         }
     }