Changeset 788 for trunk

Timestamp:

Jul 30, 2007 10:08:29 AM (17 years ago)

Author:

dkearney

Message:

adjustments to entity references encoding to include the length of the string to encode and decode.
this is used for the python bindings, so we can know the length of the string being returned and allow embedded nulls.

Location:

trunk/src/core

Files:

• RpEntityRef.cc (modified) (5 diffs)
• RpEntityRef.h (modified) (1 diff)
• RpLibrary.cc (modified) (4 diffs)

trunk/src/core/RpEntityRef.cc

@@ -40 +40 @@
 const char*
 EntityRef::decode (
-    const char* value
+    const char* value,
+    unsigned int len
 )
 {
     unsigned int pos = 0;
-    unsigned int len = 0;
 
     if (value == NULL) {
@@ -52 +52 @@
 
     _bout.clear();
-    len = strlen(value);
+    if (len == 0) {
+        len = strlen(value);
+    }
 
     while (pos < len) {
@@ -112 +114 @@
 const char*
 EntityRef::encode (
-    const char* value
+    const char* value,
+    unsigned int len
 )
 {
     unsigned int pos = 0;
-    unsigned int len = 0;
 
 
@@ -125 +127 @@
 
     _bout.clear();
-    len = strlen(value);
+    if (len == 0) {
+        len = strlen(value);
+    }
 
     while (pos < len) {
@@ -156 +160 @@
 }
 
+int
+EntityRef::size () {
+    return _bout.size();
+}
+
+
 #ifdef __cplusplus
     } // extern c

trunk/src/core/RpEntityRef.h

@@ -42 +42 @@
 {
     public:
-        const char* encode (const char* in);
-        const char* decode (const char* in);
+        const char* encode (const char* in, unsigned int len);
+        const char* decode (const char* in, unsigned int len);
+        int size();
 
         EntityRef () {};

trunk/src/core/RpLibrary.cc

@@ -1539 +1539 @@
     status &= Rappture::encoding::decode(inData,0);
     status.addContext("RpLibrary::getSting");
-    inData.append("\0",1);
+    // inData.append("\0",1);
 
     if (translateFlag == RPLIB_TRANSLATE) {
-        translatedContents = ERTranslator.decode(inData.bytes());
+        translatedContents = ERTranslator.decode(inData.bytes(),inData.size());
         if (translatedContents == NULL) {
             // translation failed
@@ -1551 +1551 @@
         }
         else {
-            retStr = std::string(translatedContents);
+            // subtract 1 from size because ERTranslator adds extra NULL
+            retStr = std::string(translatedContents,ERTranslator.size()-1);
             translatedContents = NULL;
         }
     }
     else {
-        retStr = std::string(inData.bytes());
+        retStr = std::string(inData.bytes(),inData.size());
     }
 
@@ -1701 +1702 @@
 
     if (translateFlag == RPLIB_TRANSLATE) {
-        translatedContents = ERTranslator.decode(retCStr);
+        translatedContents = ERTranslator.decode(retCStr,0);
         if (translatedContents == NULL) {
             // translation failed
@@ -1769 +1770 @@
 
         if (translateFlag == RPLIB_TRANSLATE) {
-            translatedContents = ERTranslator.encode(value.c_str());
+            translatedContents = ERTranslator.encode(value.c_str(),0);
         }
         else {