Changeset 752 for trunk/src2

Timestamp:

May 30, 2007 12:19:11 AM (17 years ago)

Author:

dkearney

Message:

added use of RPENC_HDR flag in decode function so users can give the RPENC_Z and RPENC_B64 flags and tell the decode function to only use those flags
if the header does not say how to treat the data.

in library.tcl, added a -decode flag set to yes by default. this flag allows the user to tell if they want the data to be automatically decoded when
it is retrieved from the xmlobj. this is paricaularly useful for dx data held within a field where we do not want the data automatcially decoded.

added the -decode no flag to dx data being retrieved from fields

updated nanovis.cpp with capability to decode data with the new @@RP-ENC: style headers.

File:

• trunk/src2/core/RpEncode.cc (modified) (4 diffs)

trunk/src2/core/RpEncode.cc

@@ -129 +129 @@
     int decompress            = 0;
     int base64                = 0;
+    int checkHDR              = 0;
     Rappture::Outcome err;
     Rappture::Buffer outData;
@@ -138 +139 @@
         base64 = 1;
     }
+    if ((flags & RPENC_HDR) == RPENC_HDR ) {
+        checkHDR = 1;
+    }
 
     if ((buf.size() > 11) && (strncmp(buf.bytes(),"@@RP-ENC:z\n",11) == 0)) {
         outData.append(buf.bytes()+11,buf.size()-11);
-        if ( (decompress == 0) && (base64 == 0) ) {
+        if ( (checkHDR == 1) || ( (decompress == 0) && (base64 == 0) ) ) {
             decompress = 1;
             base64 = 0;
@@ -148 +152 @@
     else if ((buf.size() > 13) && (strncmp(buf.bytes(),"@@RP-ENC:b64\n",13) == 0)) {
         outData.append(buf.bytes()+13,buf.size()-13);
-        if ( (decompress == 0) && (base64 == 0) ) {
+        if ( (checkHDR == 1) || ( (decompress == 0) && (base64 == 0) ) ) {
             decompress = 0;
             base64 = 1;
@@ -155 +159 @@
     else if ((buf.size() > 14) && (strncmp(buf.bytes(),"@@RP-ENC:zb64\n",14) == 0)) {
         outData.append(buf.bytes()+14,buf.size()-14);
-        if ( (decompress == 0) && (base64 == 0) ) {
+        if ( (checkHDR == 1) || ( (decompress == 0) && (base64 == 0) ) ) {
             decompress = 1;
             base64 = 1;