First crack at xml parser object.

CVS patchset: 7317
CVS date: 2004/06/14 03:12:22

1 files changed, 6 insertions, 156 deletions

diff --git a/tools/rpmxml.c b/tools/rpmxml.c
index 95107b36a..8ef1109c1 100644
--- a/tools/rpmxml.c
+++ b/tools/rpmxml.c
@@ -1,166 +1,16 @@
 #include "system.h"
-#include <libxml/xmlreader.h>
+#include <rpmxp.h>
 #include "debug.h"
 
-typedef struct rpmxp_s * rpmxp;
-
-struct rpmxp_s {
-    xmlTextReaderPtr reader;
-
-    xmlChar * name;
-    xmlChar * value;
-    int depth;
-    int nodeType;
-    int isEmptyElement;
-
-    int n;
-};
-
-static int _rpmxp_debug = 0;
-
-static rpmxp rpmxpFree(rpmxp xp)
-{
-    if (xp != NULL) {
-	if (xp->value) {
-	    xmlFree(xp->value);
-	    xp->value = NULL;
-	}
-	if (xp->name) {
-	    xmlFree(xp->name);
-	    xp->name = NULL;
-	}
-	if (xp->reader != NULL) {
-	    xmlFreeTextReader(xp->reader);
-	    xp->reader = NULL;
-	}
-	free(xp);
-	xp = NULL;
-    }
-    return xp;
-}
-
-static rpmxp rpmxpNew(const char * fn)
-{
-    rpmxp xp = calloc(1, sizeof(*xp));
-
-    if (xp == NULL)
-	return NULL;
-    if (fn) {
-	int xx;
-	xp->reader = xmlNewTextReaderFilename(fn);
-	if (xp->reader == NULL)
-	    return rpmxpFree(xp);
-	xx = xmlTextReaderSetParserProp(xp->reader, XML_PARSER_VALIDATE, 1);
-	xx = xmlTextReaderSetParserProp(xp->reader, XML_PARSER_SUBST_ENTITIES, 1);
-    }
-    xp->name = NULL;
-    xp->value = NULL;
-    xp->depth = 0;
-    xp->nodeType = 0;
-    xp->isEmptyElement = 0;
-    xp->n = 2;
-    return xp;
-}
-
-static int rpmxpRead(rpmxp xp)
-{
-    return xmlTextReaderRead(xp->reader);
-}
-
-static void rpmxpProcess(rpmxp xp)
-{
-    xp->name = xmlTextReaderName(xp->reader);
-    xp->value = xmlTextReaderValue(xp->reader);
-    xp->depth = xmlTextReaderDepth(xp->reader);
-    xp->nodeType = xmlTextReaderNodeType(xp->reader);
-    xp->isEmptyElement = xmlTextReaderIsEmptyElement(xp->reader);
-
-    if (xp->name == NULL)
-	xp->name = xmlStrdup(BAD_CAST "--");
-
-if (_rpmxp_debug)
-printf("%d %d %s %d\n", xp->depth, xp->nodeType, xp->name, xp->isEmptyElement);
-    switch (xp->nodeType) {
-    case XML_READER_TYPE_ELEMENT:
-	printf("%*s<%s", (xp->n * xp->depth), "", xp->name);
-	while (xmlTextReaderMoveToNextAttribute(xp->reader) != 0) {
-	    xmlChar * attrN = xmlTextReaderName(xp->reader);
-	    xmlChar * attrV = xmlTextReaderValue(xp->reader);
-	    printf(" %s", attrN);
-	    if (attrV) {
-		printf("=\"%s\"", attrV);
-		xmlFree(attrV);
-	    }
-	    xmlFree(attrN);
-	}
-	printf(">");
-	if (xp->depth < 2)
-	    printf("\n");
-	break;
-    case XML_READER_TYPE_END_ELEMENT:
-	if (xp->depth < 2)
-	    printf("%*s", (xp->n * xp->depth), "");
-	printf("</%s>\n", xp->name);
-	break;
-    case XML_READER_TYPE_TEXT:
-	printf("%s", xp->value);
-	break;
-    case XML_READER_TYPE_DOCUMENT_TYPE:
-	break;
-    case XML_READER_TYPE_SIGNIFICANT_WHITESPACE:
-	break;
-
-    case XML_READER_TYPE_NONE:
-    case XML_READER_TYPE_ATTRIBUTE:
-    case XML_READER_TYPE_CDATA:
-    case XML_READER_TYPE_ENTITY_REFERENCE:
-    case XML_READER_TYPE_ENTITY:
-    case XML_READER_TYPE_PROCESSING_INSTRUCTION:
-    case XML_READER_TYPE_COMMENT:
-    case XML_READER_TYPE_DOCUMENT:
-    case XML_READER_TYPE_DOCUMENT_FRAGMENT:
-    case XML_READER_TYPE_NOTATION:
-    case XML_READER_TYPE_WHITESPACE:
-    case XML_READER_TYPE_END_ENTITY:
-    case XML_READER_TYPE_XML_DECLARATION:
-    default:
-	printf("%d %d %s %d\n", xp->depth, xp->nodeType,
-		xp->name, xp->isEmptyElement);
-	if (xp->value)
-	    printf(" %s", xp->value);
-	if (xp->depth < 2)
-	    printf("\n");
-	break;
-    }
-
-
-    if (xp->value != NULL) {
-        xmlFree(xp->value);
-	xp->value = NULL;
-    }
-    if (xp->name != NULL) {
-	xmlFree(xp->name);
-	xp->name = NULL;
-    }
-}
-
-static int streamFile(const char * fn)
-{
-    rpmxp xp = rpmxpNew(fn);
-    int ret = -1;
-
-    if (xp != NULL)
-    while ((ret = rpmxpRead(xp)) == 1)
-	rpmxpProcess(xp);
-    xp = rpmxpFree(xp);
-    return ret;
-}
-
 int main(int argc, char ** argv)
 {
     const char * fn = "time.xml";
+    rpmxp xp;
     int ec = 0;
 
-    streamFile(fn);
+    xp = rpmxpNew(fn);
+    rpmxpParseFile(xp);
+    xp = rpmxpFree(xp);
+
     return ec;
 }