Changeset 186 for trunk/src/helpers/xml.c

Timestamp:

Jul 6, 2002, 11:12:59 PM (23 years ago)

Author:

umoeller

Message:

Some Unicode fixes.

File:

• trunk/src/helpers/xml.c (modified) (4 diffs)

trunk/src/helpers/xml.c

@@ -2601 +2601 @@
 }
 
+#ifdef __DEBUG__
+
+/*
+ *@@ Dump:
+ *
+ *@@added V0.9.20 (2002-07-03) [umoeller]
+ */
+
+static VOID Dump(int iIndent,
+                 PDOMNODE pDomNode)
+{
+    PLISTNODE pChildNode;
+    int i;
+    for (i = 0;
+         i < iIndent;
+         ++i)
+    {
+        printf(" ");
+    }
+
+    switch (pDomNode->NodeBase.ulNodeType)
+    {
+        #define DUMPTYPE(t) case t: printf(#t); break;
+        DUMPTYPE(DOMNODE_ELEMENT)
+        DUMPTYPE(DOMNODE_ATTRIBUTE)
+        DUMPTYPE(DOMNODE_TEXT)
+        DUMPTYPE(DOMNODE_PROCESSING_INSTRUCTION)
+        DUMPTYPE(DOMNODE_COMMENT)
+        DUMPTYPE(DOMNODE_DOCUMENT)
+        DUMPTYPE(DOMNODE_DOCUMENT_TYPE)
+        DUMPTYPE(ELEMENTPARTICLE_EMPTY)
+        DUMPTYPE(ELEMENTPARTICLE_ANY)
+        DUMPTYPE(ELEMENTPARTICLE_MIXED)
+        DUMPTYPE(ELEMENTPARTICLE_CHOICE)
+        DUMPTYPE(ELEMENTPARTICLE_SEQ)
+        DUMPTYPE(ELEMENTPARTICLE_NAME)
+        DUMPTYPE(ATTRIBUTE_DECLARATION_BASE)
+        DUMPTYPE(ATTRIBUTE_DECLARATION)
+        DUMPTYPE(ATTRIBUTE_DECLARATION_ENUM)
+    }
+
+    printf(" \"%s\"\n", STRINGORNULL(pDomNode->NodeBase.strNodeName.psz));
+
+    ++iIndent;
+    for (pChildNode = lstQueryFirstNode(&pDomNode->llChildren);
+         pChildNode;
+         pChildNode = pChildNode->pNext)
+    {
+        Dump(iIndent, (PDOMNODE)pChildNode->pItemData);
+    }
+    --iIndent;
+}
+
+#endif
+
+/*
+ *@@ xmlDump:
+ *      debug function which dumps the DOM to stdout.
+ *
+ *@@added V0.9.20 (2002-07-03) [umoeller]
+ */
+
+VOID xmlDump(PXMLDOM pDom)
+{
+#ifdef __DEBUG__
+    if (!pDom)
+    {
+        printf(__FUNCTION__ ": pDom is NULL\n");
+        return;
+    }
+
+    printf(__FUNCTION__ ": dumping document node ");
+
+    Dump(0, (PDOMNODE)pDom->pDocumentNode);
+#endif
+}
+
 /*
  *@@ xmlFreeDOM:
@@ -2746 +2823 @@
  *
  *@@added V0.9.11 (2001-04-22) [umoeller]
+ *@@changed V0.9.20 (2002-07-03) [umoeller]: this never worked with DTDs, fixed
  */
 
@@ -2757 +2835 @@
        )
     {
-        return ((PDOMNODE)pListNode->pItemData);
+        // V0.9.20 (2002-07-03) [umoeller]:
+        // we can't just return the first node on the
+        // list, because if we have DTD, this might
+        // be the doctype... so loop until we find
+        // an element, which must be the root element
+        while (pListNode)
+        {
+            PDOMNODE pDomNode = (PDOMNODE)pListNode->pItemData;
+            if (pDomNode->NodeBase.ulNodeType == DOMNODE_ELEMENT)
+                return (pDomNode);
+
+            pListNode = pListNode->pNext;
+        }
     }
 
@@ -2843 +2933 @@
                                   const char *pcszName)
 {
-    // APIRET arc = NO_ERROR;
-
     PLINKLIST pll = lstCreate(FALSE);       // no free
     if (pll)