X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fxmlread.c;h=6bc8efab5baefc0f040c8b8f993a0cc3eac8cf61;hb=d9fb3117ca1b5f0038f8367c9a1d5d8f933b8920;hp=99951c6751ad4978ce6423e5d17948429772d7df;hpb=025215fcab86e8ea7c143238da9ffab5afdd1067;p=idzebra-moved-to-github.git

diff --git a/recctrl/xmlread.c b/recctrl/xmlread.c
index 99951c6..6bc8efa 100644
--- a/recctrl/xmlread.c
+++ b/recctrl/xmlread.c
@@ -1,5 +1,5 @@
-/* $Id: xmlread.c,v 1.9 2003-09-08 09:30:17 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: xmlread.c,v 1.12 2004-07-26 12:26:25 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -43,7 +43,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define XML_CHUNK 1024
 
 struct user_info {
-    int full_error_info;
     data1_node *d1_stack[256];
     int level;
     data1_handle dh;
@@ -80,7 +79,7 @@ static void cb_chardata (void *user, const char *s, int len)
                                                    ui->d1_stack[ui->level -1]);
 }
 
-static void cb_decl (void *user, const char *version, const char*encoding,
+static void cb_decl (void *user, const char *version, const char *encoding,
                      int standalone)
 {
     struct user_info *ui = (struct user_info*) user;
@@ -90,7 +89,7 @@ static void cb_decl (void *user, const char *version, const char*encoding,
     attr_list[1] = version;
 
     attr_list[2] = "encoding";
-    attr_list[3] = "UTF-8"; /* encoding */
+    attr_list[3] = "UTF-8"; /* internally it's always UTF-8 */
 
     attr_list[4] = "standalone";
     attr_list[5] = standalone  ? "yes" : "no";
@@ -99,7 +98,7 @@ static void cb_decl (void *user, const char *version, const char*encoding,
     
     data1_mk_preprocess (ui->dh, ui->nmem, "xml", attr_list,
                              ui->d1_stack[ui->level-1]);
-    yaz_log (ui->loglevel, "decl version=%s encoding=%s",
+    yaz_log (LOG_LOG, "decl version=%s encoding=%s",
              version ? version : "null",
              encoding ? encoding : "null");
 }
@@ -116,8 +115,6 @@ static void cb_processing (void *user, const char *target,
     yaz_log (ui->loglevel, "decl processing target=%s data=%s",
              target ? target : "null",
              data ? data : "null");
-    
-    
 }
 
 static void cb_comment (void *user, const char *data)
@@ -203,17 +200,12 @@ static int cb_external_entity (XML_Parser pparser,
         }
         if (!XML_ParseBuffer (parser, r, done))
         {
-	    if (ui->full_error_info)
-		yaz_log (LOG_WARN, "%s:%d:%d:XML error: %s",
-			 systemId,
-			 XML_GetCurrentLineNumber(parser),
-			 XML_GetCurrentColumnNumber(parser),
-			 XML_ErrorString(XML_GetErrorCode(parser)));
-	    else
-		yaz_log (LOG_WARN, "%s:%d:XML error: %s",
-			 systemId,
-			 XML_GetCurrentLineNumber(parser),
-			 XML_ErrorString(XML_GetErrorCode(parser)));
+	    done = 1;
+	    yaz_log (LOG_WARN, "%s:%d:%d:XML error: %s",
+		     systemId,
+		     XML_GetCurrentLineNumber(parser),
+		     XML_GetCurrentColumnNumber(parser),
+		     XML_ErrorString(XML_GetErrorCode(parser)));
 	}
     }
     fclose (inf);
@@ -401,14 +393,13 @@ static void cb_ns_end(void *userData, const char *prefix)
 }
 data1_node *zebra_read_xml (data1_handle dh,
                             int (*rf)(void *, char *, size_t), void *fh,
-                            NMEM m,
-			    int full_error_info)
+                            NMEM m)
 {
     XML_Parser parser;
     struct user_info uinfo;
     int done = 0;
+    data1_node *first_node;
 
-    uinfo.full_error_info = full_error_info;
     uinfo.loglevel = LOG_DEBUG;
     uinfo.level = 1;
     uinfo.dh = dh;
@@ -452,26 +443,39 @@ data1_node *zebra_read_xml (data1_handle dh,
             done = 1;
         if (!XML_ParseBuffer (parser, r, done))
         {
-	    if (full_error_info)
-		yaz_log (LOG_WARN, "%d:%d:XML error: %s",
-			 XML_GetCurrentLineNumber(parser),
-			 XML_GetCurrentColumnNumber(parser),
-			 XML_ErrorString(XML_GetErrorCode(parser)));
-	    else
-		yaz_log (LOG_WARN, "XML error: %s",
-			 XML_ErrorString(XML_GetErrorCode(parser)));
+	    done = 1;
+	    yaz_log (LOG_WARN, "%d:%d:XML error: %s",
+		     XML_GetCurrentLineNumber(parser),
+		     XML_GetCurrentColumnNumber(parser),
+		     XML_ErrorString(XML_GetErrorCode(parser)));
 	}
     }
     XML_ParserFree (parser);
     if (!uinfo.d1_stack[1] || !done)
         return 0;
+    /* insert XML header if not present .. */
+    first_node = uinfo.d1_stack[0]->child;
+    if (first_node->which != DATA1N_preprocess ||
+	strcmp(first_node->u.preprocess.target, "xml"))
+    {
+        const char *attr_list[5];
+
+        attr_list[0] = "version";
+        attr_list[1] = "1.0";
+
+        attr_list[2] = "encoding";
+        attr_list[3] = "UTF-8"; /* encoding */
+
+        attr_list[4] = 0;
+    
+        data1_insert_preprocess (uinfo.dh, uinfo.nmem, "xml", attr_list,
+				 uinfo.d1_stack[0]);
+    }
     return uinfo.d1_stack[0];
 }
 
 struct xml_info {
     XML_Expat_Version expat_version;
-    int full_error_info;   /* true if we can safely use Expat's
-			      XML_GetCurrent{Line,Column}Number */
 };
 
 static void *grs_init_xml(void)
@@ -480,22 +484,12 @@ static void *grs_init_xml(void)
 
     p->expat_version = XML_ExpatVersionInfo();
 
-    /* determine if we can use XML_GetCurrent{Line,Column}Number */
-    p->full_error_info = 0;
-    if (p->expat_version.major > 1)
-	p->full_error_info = 1;
-    else if (p->expat_version.major == 1 && p->expat_version.minor > 95)
-	p->full_error_info = 1;
-    else if (p->expat_version.major == 1 && p->expat_version.minor == 95
-	     && p->expat_version.micro >= 3)
-	p->full_error_info = 1;
     return p;
 }
 
 static data1_node *grs_read_xml (struct grs_read_info *p)
 {
-    struct xml_info *x = (struct xml_info *) p->clientData;
-    return zebra_read_xml (p->dh, p->readf, p->fh, p->mem, x->full_error_info);
+    return zebra_read_xml (p->dh, p->readf, p->fh, p->mem);
 }
 
 static void grs_destroy_xml(void *clientData)