X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmod_dom.c;h=b1555d7add25712f74d73edfc626957f16e4faba;hb=cf66499bac7c49c5bdd363a2c927295fa92f547a;hp=d93853279740aad8441f9b114b14fb2ad4e06fe3;hpb=1995ca9c4d5451771944163fc302d21578055241;p=idzebra-moved-to-github.git

diff --git a/index/mod_dom.c b/index/mod_dom.c
index d938532..b1555d7 100644
--- a/index/mod_dom.c
+++ b/index/mod_dom.c
@@ -1,5 +1,5 @@
 
-/* $Id: mod_dom.c,v 1.28 2007-03-06 08:48:57 adam Exp $
+/* $Id: mod_dom.c,v 1.30 2007-03-07 14:18:35 marc Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -1142,8 +1142,9 @@ static int extract_xml_split(struct filter_info *tinfo,
                                                    p /* I/O handler */,
                                                    0 /* URL */, 
                                                    0 /* encoding */,
-                                                   XML_PARSE_XINCLUDE|
-                                                   XML_PARSE_NOENT);
+                                                   XML_PARSE_XINCLUDE
+                                                   | XML_PARSE_NOENT
+                                                   | XML_PARSE_NONET);
     }
     if (!input->u.xmlreader.reader)
 	return RECCTRL_EXTRACT_ERROR_GENERIC;
@@ -1157,12 +1158,12 @@ static int extract_xml_split(struct filter_info *tinfo,
         if (type == XML_READER_TYPE_ELEMENT && 
             input->u.xmlreader.split_level == depth)
         {
+            xmlNodePtr ptr;
+
             /* per default do not ingest record */
             tinfo->record_info_invoked = 0;
-
-           xmlNodePtr ptr
-                = xmlTextReaderExpand(input->u.xmlreader.reader);
-
+            
+            ptr = xmlTextReaderExpand(input->u.xmlreader.reader);
             if (ptr)
                 {
                 /* we have a new document */
@@ -1210,7 +1211,9 @@ static int extract_xml_full(struct filter_info *tinfo,
                                   p /* I/O handler */,
                                   0 /* URL */,
                                   0 /* encoding */,
-                                  XML_PARSE_XINCLUDE|XML_PARSE_NOENT);
+                                  XML_PARSE_XINCLUDE
+                                  | XML_PARSE_NOENT
+                                  | XML_PARSE_NONET);
         if (!doc)
         {
             return RECCTRL_EXTRACT_ERROR_GENERIC;
@@ -1369,7 +1372,7 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
     doc = xmlReadIO(ioread_ret, ioclose_ret, p /* I/O handler */,
 		    0 /* URL */,
 		    0 /* encoding */,
-		    XML_PARSE_XINCLUDE|XML_PARSE_NOENT);
+		    XML_PARSE_XINCLUDE | XML_PARSE_NOENT | XML_PARSE_NONET);
     if (!doc)
     {
         p->diagnostic = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;