Changeset 200 for trunk/src

Timestamp:

Feb 20, 2006, 2:37:44 PM (19 years ago)

Author:

dkearney

Message:

adjusted copy and remove functions in core library.
added a bit of error checking in other core functions.
updated test file accordingly.

File:

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

trunk/src/core/RpLibrary.cc

@@ -62 +62 @@
 
     // listLen should be the highest index + 1
-    for (   pos = path.find(".",0);
+    for (   pos = path.find(".",NO_CREATE_PATH);
             (pos != std::string::npos) || (index >= listLen);
             pos = path.find(".",pos)   )
@@ -405 +405 @@
 
         if (node == NULL) {
-            if (create == 0) {
+            if (create == NO_CREATE_PATH) {
                 // break out instead of returning because we still need to
                 // free the list variable
@@ -413 +413 @@
             }
             else {
-                // create == 1
+                // create == CREATE_PATH
                 // we should create the rest of the path
 
@@ -469 +469 @@
 /// Search the path of a xml tree and return a RpLibrary node.
 /**
+ * It is the user's responsibility to delete the object when 
+ * they are finished using it?, else i need to make this static
  */
 
@@ -476 +478 @@
     RpLibrary* retLib = NULL;
     scew_element* retNode = NULL;
+
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return NULL;
+    }
 
     if (path.empty()) {
@@ -483 +490 @@
 
     // get the node located at path
-    retNode = _find(path,0);
+    retNode = _find(path,NO_CREATE_PATH);
 
     // if the node exists, create a rappture library object for it.
@@ -497 +504 @@
 /// Search the path of a xml tree and return its parent.
 /**
+ * It is the user's responsibility to delete the object when 
+ * they are finished using it?, else i need to make this static
  */
 
@@ -506 +515 @@
     std::string::size_type pos = 0;
     scew_element* retNode = NULL;
+
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return NULL;
+    }
 
     if (path.empty()) {
@@ -520 +534 @@
 
         // search for hte parent's node
-        retNode = _find(parentPath,0);
+        retNode = _find(parentPath,NO_CREATE_PATH);
 
         if (retNode) {
@@ -544 +558 @@
 {
     RpLibrary* value = NULL;
+
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return *this;
+    }
 
     if (fromObj == NULL) {
@@ -581 +600 @@
     scew_element* childNode = NULL;
     std::string childName = "";
+
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return NULL;
+    }
 
 
@@ -601 +625 @@
         // we need to search for a new parentNode
         else {
-            parentNode = _find(path,0);
+            parentNode = _find(path,NO_CREATE_PATH);
             if (parentNode == NULL) {
                 // node not found
@@ -685 +709 @@
 RpLibrary::getString (std::string path)
 {
-    scew_element* retNode = _find(path,0);
+    scew_element* retNode = NULL;
     XML_Char const* retCStr = NULL;
+
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return std::string("");
+    }
+
+    retNode = _find(path,NO_CREATE_PATH);
 
     if (retNode == NULL) {
@@ -714 +745 @@
     double retValDbl = 0;
 
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return retValDbl;
+    }
+
     retValStr = this->getString(path); 
     // think about changing this to strtod()
@@ -737 +773 @@
     const char* contents = NULL;
 
-//    if (! path.empty()) {
-        retNode = _find(path,1);
-
-        if (retNode) {
-
-            if (append) {
-                if ( (contents = scew_element_contents(retNode)) ) {
-                    tmpVal = std::string(contents);
-                }
-                value = tmpVal + value;
-            }
-
-            scew_element_set_contents(retNode,value.c_str());
-        }
-//    }
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return *this;
+    }
+
+    retNode = _find(path,CREATE_PATH);
+
+    if (retNode) {
+
+        if (append) {
+            if ( (contents = scew_element_contents(retNode)) ) {
+                tmpVal = std::string(contents);
+            }
+            value = tmpVal + value;
+        }
+
+        scew_element_set_contents(retNode,value.c_str());
+    }
 
     return *this;
@@ -766 +805 @@
 {
     std::stringstream valStr;
+
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return *this;
+    }
 
     valStr << value;
@@ -786 +830 @@
     int retVal = 1;
 
-    retNode = _find(path,1);
-
-    if (value) {
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return *this;
+    }
+
+    // you cannot put a null RpLibrary into the tree
+    if (!value) {
         // need to send back an error saying that user specified a null value
         return *this;
     }
+
+    retNode = _find(path,CREATE_PATH);
 
     if (retNode) {
@@ -805 +855 @@
 
 
-/*
-RpLibrary&
+/**********************************************************************/
+// METHOD: remove()
+/// Remove the provided path from this RpLibrary
+/**
+ */
+
+RpLibrary*
 RpLibrary::remove ( std::string path )
 {
-    scew_element* ele = _find(path,0);
-    RpLibrary* retLib;
+    scew_element* ele = NULL;
+    int setNULL = 0;
+    RpLibrary* retLib = NULL;
+
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return NULL;
+    }
+
+    if ( !path.empty() ) {
+        ele = _find(path,NO_CREATE_PATH);
+    }
+    else {
+        // telling this function to remove "" is essentially destroying
+        // the object. most functions will fail after a call like this.
+        ele = this->root;
+        setNULL++;
+    }
+
     if (ele) {
-        retLib = new RpLibrary(ele)
-    }
-
-    return *retLib
-}
-*/
+        scew_element_free(ele);
+        if (setNULL) {
+            // this is the case where user specified an empty path.
+            // the object is useless, and will be deleted.
+            this->root = NULL;
+            delete this;
+            retLib = NULL;
+        }
+        else {
+            retLib = this;
+        }
+    }
+
+    return retLib;
+}
 
 /**********************************************************************/
@@ -830 +911 @@
     std::stringstream outString;
 
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return std::string("");
+    }
+
     outString << "<?xml version=\"1.0\"?>\n";
     print_element(this->root, 0, outString);
@@ -845 +931 @@
 RpLibrary::nodeType ()
 {
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return std::string("");
+    }
+
     return std::string(scew_element_name(root));
 }
@@ -857 +948 @@
 RpLibrary::nodeId ()
 {
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return std::string("");
+    }
+
     return _node2name(root);
 }
@@ -869 +965 @@
 RpLibrary::nodeComp ()
 {
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return std::string("");
+    }
+
     return _node2comp(root);
 }
@@ -881 +982 @@
 RpLibrary::nodePath ()
 {
+    if (!this->root) {
+        // library doesn't exist, do nothing;
+        return std::string("");
+    }
+
     return _node2path(root);
 }
@@ -905 +1011 @@
     time_t t = 0;
 
-    outputFile << "run" << (int)time(&t) << ".xml";
-    file.open(outputFile.str().c_str(),std::ios::out);
-
-    if ( file.is_open() ) {
-        xmlText = xml();
-        if (!xmlText.empty()) {
-            file << xmlText;
-        }
-    }
-    std::cout << "=RAPPTURE-RUN=>" << outputFile.str() << std::endl;
+    if (this->root) {
+        outputFile << "run" << (int)time(&t) << ".xml";
+        file.open(outputFile.str().c_str(),std::ios::out);
+
+        if ( file.is_open() ) {
+            xmlText = xml();
+            if (!xmlText.empty()) {
+                file << xmlText;
+            }
+        }
+        std::cout << "=RAPPTURE-RUN=>" << outputFile.str() << std::endl;
+    }
 }