Changeset 192 for trunk/include

Timestamp:

Feb 19, 2006, 10:40:13 AM (19 years ago)

Author:

dkearney

Message:

1) added nodePath() function to core RpLibrary?, this fxn returns the full·
path of a given element
2) added parent() fxn to core RpLibrary?, this fxn retrieves the parent·
node of a given path
3) added put() fxn to core RpLibrary?, this fxn allows user to put an·
RpLibrary? element into an xml tree at the provided path
4) removed restrictions on not being able to send empty path to put()·
fxns. empty paths will be interpreted as the root of the xml tree.
5) enabled all RpLibrary? objects to include which tryy an object came·
from, adjusted RpLibrary?.h:339. this change will not require/allow·
RpLibrary? Objects to destroy the tree they came from, it is only for·
reference purposes.
6) added new libscew fxn - scew_element_copy, as a low level fxn to copy·
a scew xml element and return a new scew xml element that is not related·
to any xml tree. the new element is created with scew_element_create.·
all attributes and children are also copied to the new element.
7) added new libscew fxn - scew_element_copy_attr, as a low level fxn to·
copy the attributes from one scew element to another scew element.
8) fixed bugs in children() fxn where user is looking for a specific type·
of child, the search hits the end of the list, and fxn failed to check if·
the childNode was null before calling operations on it.
9) adjusted RpLibrary?'s private constructor to set the default value for·
the freeTree flag to 0 (zero). in the cases where we use this private·
constructor, the new objects that are created are only used as reference·
and should not actually be used as real RpLibraries? with real xml trees.

Location:

trunk/include/core

Files:

• RpLibrary.h (modified) (6 diffs)
• scew_extras.h (modified) (2 diffs)

trunk/include/core/RpLibrary.h

@@ -35 +35 @@
 
         RpLibrary* element (std::string path = "");
+        RpLibrary* parent (std::string path = "");
 
         // should return RpObject& but for simplicity right now it doesnt
@@ -44 +45 @@
                                 int* childCount = NULL  );
 
+        RpLibrary& copy       ( std::string toPath,
+                                std::string fromPath,
+                                RpLibrary* fromObj = NULL);
+
         std::string get       ( std::string path = "");
         std::string getString ( std::string path = "");
@@ -58 +63 @@
                             int append = 0  );
 
+        RpLibrary& put (    std::string path,
+                            RpLibrary* value,
+                            std::string id = "",
+                            int append = 0  );
+
         RpLibrary& remove (std::string path = "");
 
@@ -65 +75 @@
         std::string nodeId();
         std::string nodeComp();
+        std::string nodePath();
 
         void result();
@@ -324 +335 @@
 
 
-        RpLibrary ( scew_element* node)
+        RpLibrary ( scew_element* node, scew_tree* tree)
             :   parser      (NULL),
-                tree        (NULL),
+                tree        (tree),
                 root        (node)
 
-        {}
+        {
+            freeTree = 0;
+        }
 
 
@@ -336 +349 @@
         std::string _node2name (scew_element* node);
         std::string _node2comp (scew_element* node);
+        std::string _node2path (scew_element* node);
+
         int _splitPath (std::string& path,
                         std::string& tagName,

trunk/include/core/scew_extras.h

@@ -7 +7 @@
  * ======================================================================
  */
-#ifdef __cplusplus 
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-extern scew_element* 
+extern scew_element*
 scew_element_parent(scew_element const* element);
 
@@ -23 +23 @@
 scew_element_list_all(scew_element const* parent, unsigned int* count);
 
-#ifdef __cplusplus 
+extern int
+scew_element_copy_attr(scew_element const* fromElement, scew_element* toElement);
+
+extern scew_element*
+scew_element_copy (scew_element* element);
+
+#ifdef __cplusplus
 }
 #endif