Changeset 24863 for main/trunk

Timestamp:

2011-12-06T13:01:02+13:00 (12 years ago)

Author:

sjm84

Message:

XMLConverter no longer keeps one converter around to reuse, it makes a new one every time, this is to avoid an error where the parser is called whilst it is already parsing

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLConverter.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLConverter.java

@@ -64 +64 @@
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.XMLConverter.class.getName());
 
+    protected EntityResolver resolver = null;
+    
     /** xerces parser */
     protected DOMParser parser = null;
@@ -96 +98 @@
     public void setEntityResolver(EntityResolver er)
     {
+        this.resolver = er;
         this.parser.setEntityResolver(er);
     }
@@ -138 +141 @@
             InputSource xml_source = new InputSource(reader);
 
-            this.parser.parse(xml_source);
-            Document doc = this.parser.getDocument();
+            DOMParser parser = new DOMParser();
+            parser.setFeature("http://xml.org/sax/features/validation", false);
+            parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+            parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false);
+            if(resolver != null)
+            {
+                parser.setEntityResolver(this.resolver);
+            }
+            parser.setErrorHandler(new ParseErrorHandler());
+            parser.parse(xml_source);
+            
+            Document doc = parser.getDocument();
 
             return doc;
@@ -158 +171 @@
             FileReader reader = new FileReader(in);
             InputSource xml_source = new InputSource(reader);
-            this.parser.parse(xml_source);
-            Document doc = this.parser.getDocument();
+            
+            DOMParser parser = new DOMParser();
+            parser.setFeature("http://xml.org/sax/features/validation", false);
+            parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+            parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false);
+            if(resolver != null)
+            {
+                parser.setEntityResolver(this.resolver);
+            }
+            parser.setErrorHandler(new ParseErrorHandler());
+            parser.parse(xml_source);
+            
+            Document doc = parser.getDocument();
             return doc;
 
@@ -180 +204 @@
             InputSource xml_source = new InputSource(isr);
 
-            this.parser.parse(xml_source);
-            Document doc = this.parser.getDocument();
+            DOMParser parser = new DOMParser();
+            parser.setFeature("http://xml.org/sax/features/validation", false);
+            parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+            parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false);
+            if(resolver != null)
+            {
+                parser.setEntityResolver(this.resolver);
+            }
+            parser.setErrorHandler(new ParseErrorHandler());
+            parser.parse(xml_source);
+            
+            Document doc = parser.getDocument();
 
             return doc;