Changeset 1264 for trunk/src/core/RpEncode.cc

Timestamp:

Jan 7, 2009 9:31:14 AM (14 years ago)

Author:

dkearney

Message:

fixing rp library's get() function for retrieving encoded data. if the data is encoded there is no need to do xml entity translation. adding a function rappture's encode class for checking to see if a string has a proper header encode header. adding corresponding tcl functions and tests. also adjusting some of the int declarations to size_t.

File:

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

trunk/src/core/RpEncode.cc

@@ -34 +34 @@
 isbinary(const char* buf, int size)
 {
+    if (buf == NULL) {
+        return 0;
+    }
+
     if (size < 0) {
         size = strlen(buf);
@@ -51 +55 @@
 }
 
-
-
-
+/**********************************************************************/
+// FUNCTION: Rappture::encoding::isencoded()
+/// checks header of given string to determine if it was encoded by rappture.
+/**
+ * Checks to see if the string buf was encoded by rappture
+ * and contains the proper "@@RP-ENC:" header.
+ * rappture encoded strings start with the string "@@RP-ENC:X\n"
+ * where X is one of z, b64, zb64
+ * This function will not work for strings that do not have the header.
+ * Full function call:
+ * Rappture::encoding::isencoded(buf,size);
+ *
+ */
+
+size_t
+isencoded(const char* buf, int size)
+{
+    size_t flags = 0;
+    size_t len = 0;
+
+    if (buf == NULL) {
+        return flags;
+    }
+
+    if (size < 0) {
+        len = strlen(buf);
+    } else {
+        len = size;
+    }
+
+    // check the following for valid rappture encoded string:
+    // all strings encoded by rappture are at least 11 characters
+    // rappture encoded strings start with the '@' character
+    // rappture encoded strings start with the string "@@RP-ENC:X\n"
+    // where X is one of z, b64, zb64
+    if (    (len >= 11)
+        &&  ('@' == *buf)
+        &&  (strncmp("@@RP-ENC:",buf,9) == 0) ) {
+
+        size_t idx = 9;
+
+        // check the string length and if the z flag was specified
+        // add 1 for \n
+        if (    (len >= (idx + 1))
+            &&  (buf[idx] == 'z') ) {
+            flags |= RPENC_Z;
+            ++idx;
+        }
+        // check the string length and if the b64 flag was specified
+        // add 1 for \n
+        if (    (len >= (idx + 2 + 1))
+            &&  (buf[idx]   == 'b')
+            &&  (buf[idx+1] == '6')
+            &&  (buf[idx+2] == '4') ) {
+            flags |= RPENC_B64;
+            idx += 3;
+        }
+        // check for the '\n' at the end of the header
+        if (buf[idx] != '\n') {
+            flags = 0;
+        }
+    }
+
+    return flags;
+}
 
 /**********************************************************************/
@@ -66 +132 @@
 
 Rappture::Outcome
-encode (Rappture::Buffer& buf, int flags)
+encode (Rappture::Buffer& buf, size_t flags)
 {
 
@@ -125 +191 @@
 
 Rappture::Outcome
-decode (Rappture::Buffer& buf, int flags)
+decode (Rappture::Buffer& buf, size_t flags)
 {