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

Timestamp:

Mar 14, 2006 11:38:29 PM (18 years ago)

Author:

dkearney

Message:

fixes for tcl bindings.

File:

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

trunk/src/core/RpLibrary.cc

@@ -110 +110 @@
     parent = scew_element_parent(node);
 
-    // if (name == NULL) {
-    if (name.empty()) {
-        siblings = scew_element_list(parent, type, &count);
-        if (count > 0) {
-            tmpCount = count;
-            while ((index < tmpCount) && (siblings[index] != node)) {
-                index++;
-            }
-
-            if (index < tmpCount) {
-
-                if (index > 0) {
-
-                    retVal << type << --index;
+    if (parent) {
+
+        // if (name == NULL) {
+        if (name.empty()) {
+            siblings = scew_element_list(parent, type, &count);
+            if (count > 0) {
+                tmpCount = count;
+                while ((index < tmpCount) && (siblings[index] != node)) {
+                    index++;
                 }
-                else {
-
-                    retVal << type;
+
+                if (index < tmpCount) {
+
+                    if (index > 0) {
+
+                        retVal << type << --index;
+                    }
+                    else {
+
+                        retVal << type;
+                    }
+
+                    /*
+                    if (retVal == NULL) {
+                        // error with allocating space
+                        return NULL;
+                    }
+                    */
                 }
-
-                /*
-                if (retVal == NULL) {
-                    // error with allocating space
-                    return NULL;
-                }
-                */
-            }
-        }
-
-        scew_element_list_free(siblings);
-
-    }
-    else {
-
-        retVal << name;
+            }
+
+            scew_element_list_free(siblings);
+
+        }
+        else {
+
+            retVal << name;
+        }
     }
 
@@ -173 +176 @@
     parent = scew_element_parent(node);
 
-    if (name.empty()) {
-        siblings = scew_element_list(parent, type, &count);
-        if (count > 0) {
-            tmpCount = count;
-            // figure out what the index value should be
-            while ((index < tmpCount) && (siblings[index] != node)) {
-                index++;
-            }
-
-            if (index < tmpCount) {
-                if (index > 0) {
-                    retVal << type << --index;
+    if (parent) {
+        if (name.empty()) {
+            siblings = scew_element_list(parent, type, &count);
+            if (count > 0) {
+                tmpCount = count;
+                // figure out what the index value should be
+                while ((index < tmpCount) && (siblings[index] != node)) {
+                    index++;
                 }
-                else {
-                    retVal << type;
+
+                if (index < tmpCount) {
+                    if (index > 0) {
+                        retVal << type << --index;
+                    }
+                    else {
+                        retVal << type;
+                    }
                 }
-            }
+
+            }
+            else {
+                // count == 0 ??? this state should never be reached
+            }
+            scew_element_list_free(siblings);
 
         }
         else {
-            // count == 0 ??? this state should never be reached
-        }
-        scew_element_list_free(siblings);
-
-    }
-    else {
-        // node has attribute id
-        retVal << type << "(" << name << ")";
-
+            // node has attribute id
+            retVal << type << "(" << name << ")";
+
+        }
     }
 
@@ -781 +786 @@
 
     if (path.empty()) {
-        // an empty path returns the current RpLibrary
-        return this;
+        // an empty path returns the parent of the current RpLibrary
+        path = this->nodePath();
     }
 
@@ -945 +950 @@
 
     return retLib;
+}
+
+/**********************************************************************/
+// METHOD: children()
+/// Returns a std::list<RpLibrary*> of all children under 'path'
+//
+// 
+/**
+ */
+
+RpLibrary&
+RpLibrary::childCount ( std::string path,
+                        int* childCount)
+{
+    scew_element* parentNode;
+    int myChildCount = 0;
+
+    if (this->root) {
+
+        if (path.empty()) {
+            // an empty path uses the current RpLibrary as parent
+            parentNode = this->root;
+        }
+
+        if (parentNode) {
+            myChildCount = scew_element_count(parentNode);
+        }
+
+        if (childCount) {
+            *childCount = myChildCount;
+        }
+
+    }
+
+    return *this;
+}
+
+/**********************************************************************/
+// METHOD: isNull()
+/// returns whether this RpLibrary is a valid library node
+//
+// 
+/**
+ */
+
+bool
+RpLibrary::isNull ()
+{
+    if (this->root) {
+        return false;
+    }
+
+    return true;
 }