Comment node. Extra root level for XML parsed data1

[yaz-moved-to-github.git] / retrieval / d1_expat.c

diff --git a/retrieval/d1_expat.c b/retrieval/d1_expat.c
index 099a922..d308328 100644 (file)
--- a/retrieval/d1_expat.c
+++ b/retrieval/d1_expat.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2002, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: d1_expat.c,v 1.1 2002-05-13 14:13:37 adam Exp $
+ * $Id: d1_expat.c,v 1.2 2002-05-21 07:43:16 adam Exp $
  */
 
 #if HAVE_EXPAT_H
@@ -27,16 +27,10 @@ struct user_info {
 static void cb_start (void *user, const char *el, const char **attr)
 {
     struct user_info *ui = (struct user_info*) user;
-    if (ui->level)
-    {
-        ui->d1_stack[ui->level] = data1_mk_tag (ui->dh, ui->nmem, el, attr,
+    ui->d1_stack[ui->level] = data1_mk_tag (ui->dh, ui->nmem, el, attr,
                                                 ui->d1_stack[ui->level-1]);
-    }
-    else
-    {
-        ui->d1_stack[0] = data1_mk_root (ui->dh, ui->nmem, el);
-    }
     ui->level++;
+    printf ("cb_start %s\n", el);
 }
 
 static void cb_end (void *user, const char *el)
@@ -44,13 +38,68 @@ static void cb_end (void *user, const char *el)
     struct user_info *ui = (struct user_info*) user;
 
     ui->level--;
+    printf ("cb_end %s\n", el);
 }
 
 static void cb_chardata (void *user, const char *s, int len)
 {
     struct user_info *ui = (struct user_info*) user;
-    ui->d1_stack[ui->level] = data1_mk_text_n (ui->dh, ui->nmem, s, len,
-                                               ui->d1_stack[ui->level -1]);
+    int i;
+
+    for (i = 0; i<len; i++)
+        if (!strchr ("\n\n ", s[i]))
+            break;
+    if (i != len)
+    {
+        ui->d1_stack[ui->level] = data1_mk_text_n (ui->dh, ui->nmem, s, len,
+                                                   ui->d1_stack[ui->level -1]);
+    }
+}
+
+static void cb_decl (void *user, const char *version, const char*encoding,
+                     int standalone)
+{
+    printf ("decl version=%s encoding=%s\n", version ? version : "null",
+            encoding ? encoding : "null");
+}
+
+static void cb_processing (void *userData, const char *target,
+                           const char *data)
+{
+    printf ("decl processing target=%s data=%s\n", target ? target : "null",
+            data ? data : "null");
+}
+
+static void cb_comment (void *userData, const char *data)
+{
+    printf ("decl comment data=%s\n", data ? data : "null");
+}
+
+static void cb_doctype_start (void *userData, const char *doctypeName,
+                              const char *sysid, const char *pubid,
+                              int has_internal_subset)
+{
+    printf ("doctype start doctype=%s sysid=%s pubid=%s\n",
+            doctypeName, sysid, pubid);
+}
+
+static void cb_doctype_end (void *userData)
+{
+    printf ("doctype end\n");
+}
+
+
+static void cb_entity_decl (void *userData, const char *entityName,
+                            int is_parameter_entity,
+                            const char *value, int value_length,
+                            const char *base, const char *systemId,
+                            const char *publicId, const char *notationName)
+{
+    printf ("entity %s is_para_entry=%d value=%.*s base=%s systemId=%s\n"
+            " publicId=%s notationName=%s\n",
+            entityName, is_parameter_entity, value_length, value,
+            base, systemId, publicId, notationName);
+    
 }
 
 #define XML_CHUNK 1024
@@ -63,16 +112,22 @@ data1_node *data1_read_xml (data1_handle dh,
     struct user_info uinfo;
     int done = 0;
 
-    uinfo.level = 0;
+    uinfo.level = 1;
     uinfo.dh = dh;
-    uinfo.d1_stack[0] = 0;
     uinfo.nmem = m;
-
+    uinfo.d1_stack[0] = data1_mk_root (dh, m, "root");
+    uinfo.d1_stack[1] = 0; /* indicate no children (see end of routine) */
+    
     parser = XML_ParserCreate (0 /* encoding */);
     
     XML_SetElementHandler (parser, cb_start, cb_end);
     XML_SetCharacterDataHandler (parser, cb_chardata);
+    XML_SetXmlDeclHandler (parser, cb_decl);
+    XML_SetProcessingInstructionHandler (parser, cb_processing);
     XML_SetUserData (parser, &uinfo);
+    XML_SetCommentHandler (parser, cb_comment);
+    XML_SetDoctypeDeclHandler (parser, cb_doctype_start, cb_doctype_end);
+    XML_SetEntityDeclHandler (parser, cb_entity_decl);
 
     while (!done)
     {
@@ -94,6 +149,8 @@ data1_node *data1_read_xml (data1_handle dh,
         XML_ParseBuffer (parser, r, done);
     }
     XML_ParserFree (parser);
+    if (!uinfo.d1_stack[1])
+        return 0;
     return uinfo.d1_stack[0];
 }