Changeset 174 for trunk

Timestamp:

Feb 14, 2006, 11:07:53 PM (19 years ago)

Author:

dkearney

Message:

1. changed the output of get(...) so that it returns an empty string if the

requested path does not exist but node is available.
ie. lib->get(input.number(max))

2. changed get to call getString instead of copying the code from getString

File:

• trunk/src/core/RpLibrary.cc (modified) (1 diff)

trunk/src/core/RpLibrary.cc

@@ -588 +588 @@
 RpLibrary::get (std::string path)
 {
+    return (this->getString(path));
+}
+
+/**********************************************************************/
+// METHOD: getString()
+/// Return the string value of the object held at location 'path'
+/**
+ */
+
+std::string
+RpLibrary::getString (std::string path)
+{
     scew_element* retNode = _find(path,0);
+    XML_Char const* retCStr = NULL;
 
     if (retNode == NULL) {
         // need to raise error
-        return "";
-    }
-
-    return std::string(scew_element_contents(retNode));
-}
-
-/**********************************************************************/
-// METHOD: getString()
-/// Return the string value of the object held at location 'path'
-/**
- */
-
-std::string
-RpLibrary::getString (std::string path)
-{
-    scew_element* retNode = _find(path,0);
-
-    if (retNode == NULL) {
-        // need to raise error
-        return "";
-    }
-
-    return std::string(scew_element_contents(retNode));
+        return std::string("");
+    }
+
+    retCStr = scew_element_contents(retNode);
+
+    if (!retCStr) {
+        return std::string("");
+    }
+
+    return std::string(retCStr);
 }