1.1 --- a/src/java/isac/util/parser/XMLParserDigest.java Mon Jun 27 15:01:06 2005 +0200
1.2 +++ b/src/java/isac/util/parser/XMLParserDigest.java Mon Jun 27 15:01:06 2005 +0200
1.3 @@ -80,9 +80,7 @@
1.4 public InputSource resolveEntity(String publicId, String systemId)
1.5 throws SAXException, IOException {
1.6 if ((systemId != null) && systemId.endsWith("isac.dtd")) {
1.7 - //System.out.println("------->inside entity resolv");
1.8 return new InputSource(new StringReader(dtd_));
1.9 - //new StringReader("<!ELEMENT dummy EMPTY>"));
1.10 } else {
1.11 System.out.println("BridgeEntityResolver: return null");
1.12 return null;
1.13 @@ -169,16 +167,16 @@
1.14 digester_.addSetNext("*/HEAD/MATHML", "setHeadLine");
1.15
1.16 digester_.addCallMethod("*/CALCHEAD/BELONGSTO", "setBelongsTo", 0);
1.17 -
1.18 +
1.19 digester_.addObjectCreate("*/CALCHEAD/MODEL", Model.class);
1.20 //..........................................................WN050624xx
1.21 addItemList(digester_, "Given");
1.22 addItemList(digester_, "Where");
1.23 addItemList(digester_, "Find");
1.24 addItemList(digester_, "Relate");
1.25 - digester_.addSetNext("*/CALCHEAD/MODEL", "setModel");
1.26 + digester_.addSetNext("*/CALCHEAD/MODEL", "setModel");
1.27 //..........................................................WN050624xx
1.28 -
1.29 +
1.30 digester_.addObjectCreate("*/CALCHEAD/SPECIFICATION",
1.31 Specification.class);
1.32 digester_.addObjectCreate("*/CALCHEAD/SPECIFICATION/THEORYID",
1.33 @@ -306,7 +304,8 @@
1.34 /**
1.35 * parse a ModelItemList
1.36 *
1.37 - * @param modPart is "GIVEN" or "WHERE" or "FIND" or "RELATE"
1.38 + * @param modPart
1.39 + * is "GIVEN" or "WHERE" or "FIND" or "RELATE"
1.40 */
1.41 private void addItemList(Digester digester, String modPart) {
1.42 String modPartUp = modPart.toUpperCase();
1.43 @@ -356,9 +355,7 @@
1.44 encodeEntities(xmlString);
1.45 try {
1.46 digester_.clear();
1.47 - //System.out.println("root === " + digester_.getRoot());
1.48 o = digester_.parse(new InputSource(new StringReader(xmlString)));
1.49 - //System.out.println("--------------->" + o);
1.50 } catch (IOException e) {
1.51 e.printStackTrace();
1.52 } catch (SAXException e) {