Changeset 165

Timestamp:

07/18/08 14:45:21 (6 months ago)

Author:

zork

Message:

XMLIStream debug more descriptive

Files:

• trunk/dba/dba/xmlistream.cpp (modified) (6 diffs)
• trunk/dba/test/xmltestcase.cpp (modified) (1 diff)

trunk/dba/dba/xmlistream.cpp

@@ -63 +63 @@
-
-  while(node != NULL) {
-
+//
-    if (!strcmp(getRootTableName(child),(const char*)node->name)) {
-      debug("updating data for member %s, starting at node %s", getRootTableName(child),(const char*)node->name);
@@ -70 +70 @@
-      applyFilters(ref,node);
-      getChildren(ref,node->children);
+      if (node->children) debug("up at node %s", (const char*)node->name);
-    };
-    node = setNextNode(node);
@@ -79 +80 @@
-  pNode = findNonTextNode(pNode);
-  const ColTable* table = getColTable(*pObject);
+  if (pNode != NULL) debug("going down, node %s, updating object '%s' collections", pNode->name, getRootTableName(*pObject));
-  while(pNode != NULL) {
-    debug("getChildren for %s at node %s", getRootTableName(*pObject), pNode->name);
-    //traverse through call collection members that
-    //have fkey name. 
@@ -96 +97 @@
-            throw DataException(err.str());
-          } else {
+            debug("got fkeyname, going down to node %s children", node->name);
-            updateCollection(pObject,entry,node->children);
+            debug("up (from fknode) at node %s", node->name);
-          };
-        } else {
@@ -132 +135 @@
-    //collection tables
-    Storeable* ref = pFilter->put();
-
+ {
-      getChildren(ref,mCurrentNode->children);
+      if (mCurrentNode->children != NULL) debug("up at node %s", (const char*)mCurrentNode->name);
+    };
-    ret = true;
-
@@ -188 +193 @@
-    if (!xmlNodeIsText(node) && !xmlStrcmp(name,node->name))
-      break;
+    if (!xmlNodeIsText(node)) debug("findNode: ignoring node %s", node->name != NULL ? (const char*)node->name : "(null)");
-  };
-

trunk/dba/test/xmltestcase.cpp

@@ -457 +457 @@
-
-    dba::XMLIStream stream(ar.getIStream());
+    //stream.enableDebug();
-    TreeObject obj1;
-    stream.get(&obj1);