Changeset 962 for trunk/src/core/RpLibrary.cc

Timestamp:

Mar 25, 2008, 12:19:50 PM (17 years ago)

Author:

dkearney

Message:

code cleanups.
adjusted gague.tcl to check the length of the string it receives for integers and reals.
modified c, matlab, and octave's lib function to handle empty string for creation of empty library.
modified matlab and octave's lib result function to handle status as a parameter.
fixed core library code to deal with incorrect order of translating xml entity references.

File:

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

trunk/src/core/RpLibrary.cc

@@ -1750 +1750 @@
         // library doesn't exist, do nothing;
         status.error("invalid library object");
-        status.addContext("RpLibrary::put()");
+        status.addContext("RpLibrary::put() - putString");
         return *this;
     }
@@ -1763 +1763 @@
     retNode = _find(path,CREATE_PATH);
 
-    if (retNode) {
-
-        if (append == RPLIB_APPEND) {
-            if ( (contents = scew_element_contents(retNode)) ) {
-                tmpVal = std::string(contents);
-            }
-            value = tmpVal + value;
-        }
-
-        if (translateFlag == RPLIB_TRANSLATE) {
-            translatedContents = ERTranslator.encode(value.c_str(),0);
-        }
-        else {
-            translatedContents = value.c_str();
-        }
-
+    if (retNode == NULL) {
+        // node not found, set error
+        status.error("Error while searching for node: node not found");
+        status.addContext("RpLibrary::put() - putString");
+        return *this;
+    }
+
+    if (translateFlag == RPLIB_TRANSLATE) {
+        translatedContents = ERTranslator.encode(value.c_str(),0);
         if (translatedContents == NULL) {
             // entity referene translation failed
@@ -1786 +1779 @@
         }
         else {
-            scew_element_set_contents(retNode,translatedContents);
+            value = std::string(translatedContents);
             translatedContents = NULL;
         }
     }
-    else {
-        // node not found, set error
-        if (!status) {
-            status.error("Error while searching for node: node not found");
-        }
-    }
+
+    if (append == RPLIB_APPEND) {
+        contents = scew_element_contents(retNode);
+        if (contents != NULL) {
+            tmpVal = std::string(contents);
+            value = tmpVal + value;
+        }
+    }
+
+    scew_element_set_contents(retNode,value.c_str());
 
     status.addContext("RpLibrary::put() - putString");
@@ -2212 +2209 @@
     std::string hostname = "";
     char *user = NULL;
-    char *host = NULL;
 
     if (this->root) {