Changeset 13210

Timestamp:

2006-11-02T11:56:40+13:00 (17 years ago)

Author:

kjdon

Message:

Category is deprecated, should be using Logger instead. turned off external DTD loading in the parser

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/XMLConverter.java (modified) (8 diffs)

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

@@ -51 +51 @@
 public class XMLConverter {
 
-     static Category logger = Category.getInstance(org.greenstone.gsdl3.util.XMLConverter.class.getName());
+     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.XMLConverter.class.getName());
 
     /** xerces parser */
@@ -64 +64 @@
         this.parser = new DOMParser();
         this.parser.setFeature("http://xml.org/sax/features/validation", false);
-
+        // don't try and load external DTD - no need if we are not validating, and may cause connection errors if a proxy is not set up.
+        this.parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
         // a performance test showed that having this on lead to increased 
         // memory use for small-medium docs, and not much gain for large 
@@ -71 +72 @@
         this.parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false);
     } catch (Exception e) {
-        logger.error("exception "+e.getMessage());
+        logger.error(e.getMessage());
     }
     }
@@ -93 +94 @@
         
     } catch (Exception e) {
-        logger.error("exception "+e.getMessage());
+        logger.error(e.getMessage());
     }
     return null;
@@ -101 +102 @@
     public Document getDOM(File in) {
     try {
-        
         FileReader reader = new FileReader(in);
         InputSource xml_source = new InputSource(reader);
-            
         this.parser.parse(xml_source);
         Document doc = this.parser.getDocument();
-        
         return doc;
 
     } catch (Exception e) {
-        logger.error("exception "+e.getMessage());
-        e.printStackTrace();
+        logger.error(e.getMessage(), e);
+        
     }
     return null;
@@ -130 +128 @@
 
     } catch (Exception e) {
-        logger.error("exception "+e.getMessage());
+        logger.error(e.getMessage());
     }
     return null;
@@ -272 +270 @@
         }
         else {
-        logger.error("Unhandled processing instruction " + nodeName);
+        logger.warn("Unhandled processing instruction " + nodeName);
         }
     }
@@ -287 +285 @@
     // A type of node that is not handled yet
     else {
-        logger.error("Warning: Unknown node type: " + nodeType+" "+getNodeTypeString(nodeType));
+        logger.warn("Unknown node type: " + nodeType+" "+getNodeTypeString(nodeType));
     }