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

Timestamp:

Nov 4, 2005 3:19:11 PM (18 years ago)

Author:

dkearney

Message:

1) removed "as" string from c++'s element() function because
the function does not have the capacity to return anything
other than RpLibrary? Instances
2) changed get() functions in library module to return strings.
this change was propagated to matlab, octave, c, fortran, c++
bindings.
3) fixed rpFreeLibrary inside of c interface, now function accepts
a pointer to a pointer to RpLibrary? (lib) and sets *lib equal to
null
4) added doxygen target to makefile. (make docs), to get graphics
you need the program named dot (debian: apt-get install graphviz)
otherwise you will get errors for the portion of the proceedure
where it is trying to create the graphics.

File:

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

trunk/src/core/RpLibrary.cc

@@ -448 +448 @@
 
 RpLibrary*
-RpLibrary::element (std::string path, std::string as)
+RpLibrary::element (std::string path)
 {
     RpLibrary* retLib; 
@@ -566 +566 @@
 }
 
-
 /**********************************************************************/
 // METHOD: get()
-/// Return the RpLibrary object held at location 'path'
-/**
- */
-
-RpLibrary*
+/// Return the string value of the object held at location 'path'
+/**
+ */
+
+std::string
 RpLibrary::get (std::string path)
 {
-    RpLibrary* retVal; 
-
-    scew_element* retNode = _find(path,0);
-
-    if (retNode == NULL) {
-        // need to raise error
-        return NULL;
-    }
-
-    retVal = new RpLibrary(retNode);
-
-    //who delete's this memory?
-    return retVal;
-}
-
-/**********************************************************************/
-// METHOD: getString()
-/// Return the string value of the object held at location 'path'
-/**
- */
-
-std::string
-RpLibrary::getString (std::string path)
-{
-    // std::string retVal; 
-
-    /*
-    if (path.empty()) {
-        return "";
-    }
-    */
-
     scew_element* retNode = _find(path,0);
 
@@ -615 +582 @@
     }
 
-    // retVal = std::string(scew_element_contents(retNode));
-    // return retVal;
+    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));