Changeset 1264 for trunk/lang/tcl/src/RpEncodeTclInterface.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/lang/tcl/src/RpEncodeTclInterface.cc (modified) (3 diffs)

trunk/lang/tcl/src/RpEncodeTclInterface.cc

@@ -68 +68 @@
         Tcl_AppendResult(interp,
             "wrong # args: should be \"",
-            Tcl_GetString(objv[0])," binary <string>\"",
+            Tcl_GetString(objv[0])," binary|encoded <string>\"",
             (char*)NULL);
         return TCL_ERROR;
@@ -78 +78 @@
     const char *buf = (const char*) Tcl_GetByteArrayFromObj(objv[2],&bufLen);
 
-    if (strcmp(type,"binary") == 0) {
+    if (('b' == *type) && (strcmp(type,"binary") == 0)) {
         if (Rappture::encoding::isbinary(buf,bufLen) != 0) {
             // non-ascii character found, return yes
@@ -86 +86 @@
         }
         return TCL_OK;
+    } else if (('e' == *type) && (strcmp(type,"encoded") == 0)) {
+        if (Rappture::encoding::isencoded(buf,bufLen) != 0) {
+            // valid "@@RP-ENC:" header found, return yes
+            Tcl_AppendResult(interp, "yes", (char*)NULL);
+        } else {
+            Tcl_AppendResult(interp, "no",(char*)NULL);
+        }
+        return TCL_OK;
     }
     Tcl_AppendResult(interp, "bad option \"", type,
-            "\": should be binary",
+            "\": should be one of binary, encoded",
             (char*)NULL);
     return TCL_ERROR;