tdraier 2005/11/25 17:10:33 CET
Modified files:
src/java/org/sensei/util XML.java
Log:
fix from pe
Revision Changes Path
1.19 +28 -16 sensei/src/java/org/sensei/util/XML.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/java/org/sensei/util/XML.java.diff?r1=1.18&r2=1.19&f=h
Index: XML.java
===================================================================
RCS file: /home/cvs/repository/sensei/src/java/org/sensei/util/XML.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XML.java 24 May 2005 16:01:39 -0000 1.18
+++ XML.java 25 Nov 2005 16:10:33 -0000 1.19
@@ -47,10 +47,10 @@
* XML
*
* $Author: tdraier $
- * $Date: 2005/05/24 16:01:39 $
- * $Id: XML.java,v 1.18 2005/05/24 16:01:39 tdraier Exp $
+ * $Date: 2005/11/25 16:10:33 $
+ * $Id: XML.java,v 1.19 2005/11/25 16:10:33 tdraier Exp $
* $RCSfile: XML.java,v $
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
* $Source: /home/cvs/repository/sensei/src/java/org/sensei/util/XML.java,v $
* $State: Exp $
*
@@ -299,28 +299,34 @@
public static Document getDocument(String path) {
Document result = null;
- try {
- if (path.startsWith("f")) {
-// DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
-// factory.setNamespaceAware(true);
-// factory.setValidating(true);
-//
factory.setAttribute("http://apache.org/xml/features/validation/schema";,
Boolean.TRUE);
-// DocumentBuilder builder = factory.newDocumentBuilder();
+ if (path.startsWith("f")) {
+ try {
DOMParser parser = new DOMParser();
FileInputStream byteStream = new
FileInputStream(getDataFile(path));
InputSource is = new InputSource(byteStream);
-// result = builder.parse(is);
LocalEntityResolver er = new
LocalEntityResolver(parser.getEntityResolver());
parser.setEntityResolver(er);
parser.parse(is);
result = parser.getDocument();
byteStream.close();
- } else {
- result = getDocumentFromString(path.substring(1));
+ } catch (Exception e) {
+ try {
+ // PE : 2005/01/08
+ // loads and parse the xml configuration file
+ DocumentBuilderFactory dfactory =
DocumentBuilderFactory.newInstance ();
+ DocumentBuilder docBuilder = dfactory.newDocumentBuilder
();
+
+ // get stream from config file
+ FileInputStream is = new
FileInputStream(getDataFile(path));
+
+ result = docBuilder.parse (is);
+ } catch (Exception ne) {
+ logger.error(ne);
+ }
}
- } catch (Exception e) {
- logger.error("Error when accessing data for "+path, e);
+ } else {
+ result = getDocumentFromString(path.substring(1));
}
return result;
}
@@ -336,7 +342,13 @@
parser.parse(is);
result = parser.getDocument();
} catch (Exception e) {
- e.printStackTrace();
+ // PE : 2005/29/07
+ try {
+ DocumentBuilder builder =
DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ result = builder.parse(new InputSource(new
StringReader(xml)));
+ } catch(Exception ne) {
+ ne.printStackTrace();
+ }
}
return result;
}
