Changeset 759 for trunk

Timestamp:

Jun 8, 2007 1:48:39 PM (17 years ago)

Author:

dkearney

Message:

fixes for the copy function within the core rappture library. this fix also includes updates to the rappture library flavor of the put command and cleans up some commented out code.

Location:

trunk/src/core

Files:

• RpLibrary.cc (modified) (24 diffs)
• RpLibrary.h (modified) (3 diffs)

trunk/src/core/RpLibrary.cc

@@ -4 +4 @@
  *
  * ======================================================================
- *  AUTHOR:  Derrick Kearney, Purdue University
+ *  AUTHOR:  Derrick S. Kearney, Purdue University
  *  Copyright (c) 2004-2007  Purdue Research Foundation
  *
@@ -320 +320 @@
     scew_attribute* attribute = NULL;
     std::string attrVal;
-    // int attrValSize = 0;
 
     if (element != NULL)
@@ -625 +624 @@
 RpLibrary::_find(std::string path, int create) const
 {
-    // std::string* tagName;
-    // std::string* id;
     std::string tagName = "";
     std::string id = "";
@@ -645 +642 @@
 
     if (path.empty()) {
-        //user gave an empty path
-        // return this;
+        // user gave an empty path
         return tmpElement;
     }
@@ -663 +659 @@
         _splitPath(*(list[listIdx]),tagName,&index,id);
 
-        // if (id->empty()) {
         if (id.empty()) {
             /*
@@ -671 +666 @@
             */
 
-            // eleList = scew_element_list(tmpElement, tagName->c_str(), &count);
             eleList = scew_element_list(tmpElement, tagName.c_str(), &count);
             tmpCount = count;
@@ -697 +691 @@
             */
 
-            // eleList = scew_element_list(tmpElement, tagName->c_str(), &count);
             if (!tagName.empty()) {
                 eleList = scew_element_list(tmpElement, tagName.c_str(), &count);
@@ -709 +702 @@
                 tmpId = _get_attribute(eleList[lcv], "id");
                 if (!tmpId.empty()) {
-                    // if (*id == tmpId) {
                     if (id == tmpId) {
                         node = eleList[lcv];
@@ -730 +722 @@
                 // break out instead of returning because we still need to
                 // free the list variable
-                // return node;
                 tmpElement = node;
                 break;
@@ -740 +731 @@
                 // create the new element
                 // need to figure out how to properly number the new element
-                // node = scew_element_add(tmpElement,tagName->c_str());
                 node = scew_element_add(tmpElement,tagName.c_str());
                 if (! node) {
-                    // a new element was not created 
+                    // a new element was not created
                 }
 
                 // add an attribute and attrValue to the new element
-                // if (id && !id->empty()) {
-                    // scew_element_add_attr_pair(node,"id",id->c_str());
                 if (!id.empty()) {
                     scew_element_add_attr_pair(node,"id",id.c_str());
@@ -755 +743 @@
         }
 
-
-        // change this so youre not allocating and deallocating so much.
-        // make it static or something.
-        // if (tagName)    { delete (tagName); }
-        // if (id)         { delete (id); }
         tagName = "";
         id = "";
@@ -785 +768 @@
 }
 
+/**********************************************************************/
+// METHOD: _checkPathConflict(scew_element *nodeA,scew_element *nodeB)
+/// check to see if nodeA is in nodeB's path
+/**
+ * This is used by put() function (the RpLibrary flavor). It is
+ * used to check if nodeA can be safely deleted and not effect nodeB
+ */
+
+int
+RpLibrary::_checkPathConflict(scew_element *nodeA, scew_element *nodeB) const
+{
+    scew_element *testNode = NULL;
+
+    if ( (nodeA == NULL) || (nodeB == NULL) ) {
+        return 0;
+    }
+
+    if (nodeA == nodeB) {
+        return 1;
+    }
+
+    testNode = nodeB;
+
+    while ((testNode = scew_element_parent(testNode)) != NULL) {
+        if (testNode == nodeA) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
 
 /**********************************************************************/
@@ -1180 +1194 @@
 RpLibrary&
 RpLibrary::copy (   std::string toPath,
-                    std::string fromPath,
-                    RpLibrary* fromObj  )
+                    RpLibrary* fromObj,
+                    std::string fromPath )
 {
     RpLibrary* value = NULL;
-    // RpLibrary* child = NULL;
 
     if (!this->root) {
@@ -1196 +1209 @@
     }
 
+    if ( (fromObj == this) && (toPath == fromPath) ) {
+        /* cannot copy over myself, causes path to disappear */
+        return (*this);
+    }
+
     value = fromObj->element(fromPath);
 
     if ( !value ) {
-        // need a good way to raise error, and this is not it.
+        status.error("fromPath could not be found within fromObj");
+        status.addContext("RpLibrary::copy");
         return *this;
     }
 
     this->put(toPath, value);
+    status.addContext("RpLibrary::copy");
     delete value;
 
@@ -1323 +1343 @@
 
 RpLibrary*
-RpLibrary::children (   std::string path, 
-                        RpLibrary* rpChildNode, 
+RpLibrary::children (   std::string path,
+                        RpLibrary* rpChildNode,
                         std::string type,
                         int* childCount)
@@ -1725 +1745 @@
     if (!this->root) {
         // library doesn't exist, do nothing;
+        status.error("invalid library object");
+        status.addContext("RpLibrary::put()");
         return *this;
     }
@@ -1789 +1811 @@
     std::stringstream valStr;
 
-    if (!this->root) {
+    if (this->root == NULL) {
         // library doesn't exist, do nothing;
+        status.error("invalid library object");
+        status.addContext("RpLibrary::put()");
         return *this;
     }
@@ -1803 +1827 @@
 /**********************************************************************/
 // METHOD: put()
-/// Put a RpLibrary* value into the xml.
+/// Put a RpLibrary* value into the xml. This is used by copy()
 /**
  *  Append flag adds additional nodes, it does not merge same 
@@ -1815 +1839 @@
                     unsigned int append )
 {
-    scew_element* retNode   = NULL;
-    // scew_element* old_elem  = NULL;
-    scew_element* new_elem  = NULL;
-    scew_element* childNode = NULL;
-    // std::string nodeName    = "";
-
-    int retVal = 1;
-
-    if (!this->root) {
+    scew_element *retNode   = NULL;
+    scew_element *new_elem  = NULL;
+    scew_element *childNode = NULL;
+    scew_element *tmpNode   = NULL;
+    const char *contents    = NULL;
+    int retVal              = 1;
+    int deleteTmpNode       = 0;
+
+    if (this->root == NULL) {
         // library doesn't exist, do nothing;
+        status.error("invalid library object");
+        status.addContext("RpLibrary::put()");
         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
+    if (value == NULL) {
+        // you cannot put a null RpLibrary into the tree
+        // user specified a null value
+        status.error("user specified NULL value");
+        status.addContext("RpLibrary::put()");
         return *this;
     }
 
-    // nodeName = value->nodeComp();
-    // old_elem = _find(path+"."+nodeName,NO_CREATE_PATH);
+    if (value->root == NULL) {
+        // you cannot put a null RpLibrary into the tree
+        // user specified a null value
+        status.error("user specified uninitialized RpLibrary object");
+        status.addContext("RpLibrary::put()");
+        return *this;
+    }
+
+    tmpNode = value->root;
 
     if (append == RPLIB_OVERWRITE) {
         retNode = _find(path,NO_CREATE_PATH);
         if (retNode) {
-            scew_element_free(retNode);
+            // compare roots to see if they are part of the
+            // same xml tree, if so, make a tmp copy of the
+            // tree to be copied before freeing it.
+            if (_checkPathConflict(retNode,tmpNode)) {
+                tmpNode = scew_element_copy(tmpNode);
+                deleteTmpNode = 1;
+            }
+            contents = scew_element_contents(tmpNode);
+            if (contents) {
+                scew_element_set_contents(retNode, "");
+            }
+
+            while ( (childNode = scew_element_next(retNode,childNode)) ) {
+                scew_element_free(childNode);
+            }
         }
         else {
@@ -1851 +1900 @@
 
     if (retNode) {
-        while ( (childNode = scew_element_next(value->root,childNode)) ) {
+        contents = scew_element_contents(tmpNode);
+        if (contents) {
+            scew_element_set_contents(retNode, contents);
+        }
+
+        while ( (childNode = scew_element_next(tmpNode,childNode)) ) {
             if ((new_elem = scew_element_copy(childNode))) {
                 if (scew_element_add_elem(retNode, new_elem)) {
@@ -1860 +1914 @@
                 else {
                     // adding new element failed
+                    status.error("error while adding child node");
+                    status.addContext("RpLibrary::put()");
                 }
             }
             else {
                 // copying new element failed
-            }
+                status.error("error while copying child node");
+                status.addContext("RpLibrary::put()");
+            }
+        }
+
+        if (deleteTmpNode == 1) {
+            scew_element_free(tmpNode);
         }
     }
     else {
         // path did not exist and was not created.
+        status.error("error while creating child node");
+        status.addContext("RpLibrary::put()");
     }
 
@@ -2146 +2210 @@
         file.open(outputFile.str().c_str(),std::ios::out);
 
-        put("tool.version.rappture.date","$LastChangedDate$");
         put("tool.version.rappture.revision","$LastChangedRevision$");
-        put("tool.version.rappture.url","$URL$");
+        put("tool.version.rappture.modified","$LastChangedDate$");
+        if ( "" == get("tool.version.rappture.language") ) {
+            put("tool.version.rappture.language","c++");
+        }
 
         // generate a timestamp for the run file
@@ -2175 +2241 @@
             // errors while writing the run.xml file.
             if (   (!file.good())
-                || ((long)xmlText.length() != (file.tellp()-(long)1)) ) {
+                || ((long)xmlText.length() != ((long)file.tellp()-(long)1))
+               ) {
                  status.error("Error while writing run file");
                  status.addContext("RpLibrary::result()");
@@ -2229 +2296 @@
     if (element != NULL)
     {
-        /**
-         * Iterates through the element's attribute list, printing the
-         * pair name-value.
-         */
-        attribute = NULL;
-        while ((attribute = scew_attribute_next(element, attribute)) != NULL)
-        {
-            outString << " " << scew_attribute_name(attribute) << "=\"" <<
-                   scew_attribute_value(attribute) << "\"";
+        if (scew_attribute_count(element) > 0) {
+            /**
+             * Iterates through the element's attribute list, printing the
+             * pair name-value.
+             */
+            attribute = NULL;
+            while((attribute=scew_attribute_next(element, attribute)) != NULL)
+            {
+                outString << " " << scew_attribute_name(attribute) << "=\"" <<
+                       scew_attribute_value(attribute) << "\"";
+            }
         }
     }

trunk/src/core/RpLibrary.h

@@ -4 +4 @@
  *
  * ======================================================================
- *  AUTHOR:  Derrick Kearney, Purdue University
+ *  AUTHOR:  Derrick S. Kearney, Purdue University
  *  Copyright (c) 2004-2007  Purdue Research Foundation
  *
@@ -67 +67 @@
 
         RpLibrary& copy       ( std::string toPath,
-                                std::string fromPath,
-                                RpLibrary* fromObj = NULL);
+                                RpLibrary* fromObj,
+                                std::string fromPath);
 
         std::string get       ( std::string path = "",
@@ -199 +199 @@
                         std::string& id ) const;
         scew_element* _find (std::string path, int create) const;
+        int _checkPathConflict (scew_element *nodeA, scew_element *nodeB) const;
         void print_indent ( unsigned int indent,
                             std::stringstream& outString) const;