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

trunk/src/core/RpLibrary.cc

@@ -1457 +1457 @@
         int myChildCount = 0;
 
-        parentNode = NULL;
+        parentNode = NULL;
         if (path.empty()) {
             // an empty path uses the current RpLibrary as parent
@@ -1539 +1539 @@
 
     inData = Rappture::Buffer(retCStr);
-    status &= Rappture::encoding::decode(inData,0);
-    status.addContext("RpLibrary::getSting");
-    // inData.append("\0",1);
-
-    if (translateFlag == RPLIB_TRANSLATE) {
-        translatedContents = ERTranslator.decode(inData.bytes(),inData.size());
-        if (translatedContents == NULL) {
-            // translation failed
-            if (!status) {
-                status.error("Error while translating entity references");
-                status.addContext("RpLibrary::getSting");
-            }
-        }
-        else {
-            // subtract 1 from size because ERTranslator adds extra NULL
-            retStr = std::string(translatedContents,ERTranslator.size()-1);
-            translatedContents = NULL;
-        }
-    }
-    else {
+
+    if (Rappture::encoding::isencoded(inData.bytes(),inData.size()) != 0) {
+        // data is encoded,
+        // coming from an rplib, this means it was at least base64 encoded
+        // there is no reason to do entity translation
+        // because base64 character set does not include xml entity chars
+        status &= Rappture::encoding::decode(inData,0);
+        status.addContext("RpLibrary::getSting");
         retStr = std::string(inData.bytes(),inData.size());
+    } else {
+        // check translateFlag to see if we need to translate entity refs
+        if (translateFlag == RPLIB_TRANSLATE) {
+            translatedContents = ERTranslator.decode(inData.bytes(),inData.size());
+            if (translatedContents == NULL) {
+                // translation failed
+                if (!status) {
+                    status.error("Error while translating entity references");
+                    status.addContext("RpLibrary::getSting");
+                }
+            } else {
+                // subtract 1 from size because ERTranslator adds extra NULL
+                retStr = std::string(translatedContents,ERTranslator.size()-1);
+                translatedContents = NULL;
+            }
+        }
     }
 
@@ -1957 +1961 @@
     Rappture::Buffer inData;
     unsigned int bytesWritten = 0;
-    int flags = 0;
+    size_t flags = 0;
 
     if (!this->root) {