Changeset 26168
- Timestamp:
- 2012-09-11T15:29:35+12:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLConverter.java
r25655 r26168 67 67 68 68 protected EntityResolver resolver = null; 69 69 70 70 /** xerces parser */ 71 71 protected DOMParser parser = null; … … 147 147 parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); 148 148 parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false); 149 if (resolver != null)149 if (resolver != null) 150 150 { 151 151 parser.setEntityResolver(this.resolver); … … 153 153 parser.setErrorHandler(new ParseErrorHandler()); 154 154 parser.parse(xml_source); 155 155 156 156 Document doc = parser.getDocument(); 157 157 158 reader.close(); 158 159 return doc; 159 160 … … 178 179 parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); 179 180 parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false); 180 if (resolver != null)181 if (resolver != null) 181 182 { 182 183 parser.setEntityResolver(this.resolver); … … 184 185 parser.setErrorHandler(new ParseErrorHandler()); 185 186 parser.parse(xml_source); 186 187 187 188 Document doc = parser.getDocument(); 188 189 190 reader.close(); 189 191 return doc; 190 192 … … 196 198 return null; 197 199 } 198 200 199 201 /** returns a DOM Document */ 200 202 public Document getDOM(File in) … … 204 206 FileReader reader = new FileReader(in); 205 207 InputSource xml_source = new InputSource(reader); 206 208 207 209 DOMParser parser = new DOMParser(); 208 210 parser.setFeature("http://xml.org/sax/features/validation", false); 209 211 parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); 210 212 parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false); 211 if (resolver != null)213 if (resolver != null) 212 214 { 213 215 parser.setEntityResolver(this.resolver); … … 215 217 parser.setErrorHandler(new ParseErrorHandler()); 216 218 parser.parse(xml_source); 217 219 218 220 Document doc = parser.getDocument(); 221 222 reader.close(); 219 223 return doc; 220 224 … … 241 245 parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); 242 246 parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false); 243 if (resolver != null)247 if (resolver != null) 244 248 { 245 249 parser.setEntityResolver(this.resolver); … … 247 251 parser.setErrorHandler(new ParseErrorHandler()); 248 252 parser.parse(xml_source); 249 253 250 254 Document doc = parser.getDocument(); 251 255 256 isr.close(); 252 257 return doc; 253 258
Note:
See TracChangeset
for help on using the changeset viewer.