From: <ha...@us...> - 2007-07-23 10:08:40
|
Revision: 7979 http://svn.sourceforge.net/jmol/?rev=7979&view=rev Author: hansonr Date: 2007-07-23 03:08:40 -0700 (Mon, 23 Jul 2007) Log Message: ----------- 11.2.5 # bug fix: ACD/Labs nonstandard cml "builtin" property reader # note that xmlReader (SAX reader) is now set to ignore all DOCTYPE declarations Modified Paths: -------------- branches/v11_2/Jmol/src/org/jmol/adapter/readers/xml/XmlReader.java branches/v11_2/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v11_2/Jmol/src/org/jmol/adapter/readers/xml/XmlReader.java =================================================================== --- branches/v11_2/Jmol/src/org/jmol/adapter/readers/xml/XmlReader.java 2007-07-23 10:04:10 UTC (rev 7978) +++ branches/v11_2/Jmol/src/org/jmol/adapter/readers/xml/XmlReader.java 2007-07-23 10:08:40 UTC (rev 7979) @@ -230,6 +230,7 @@ } protected void parseReaderXML(XMLReader xmlReader) { + xmlReader.setEntityResolver(new DummyResolver()); InputSource is = new InputSource(reader); is.setSystemId("foo"); try { @@ -323,6 +324,20 @@ */ } + public class DummyResolver implements EntityResolver { + public InputSource resolveEntity(String publicID, String systemID) + throws SAXException { + if (Logger.isActiveLevel(Logger.LEVEL_DEBUG)) { + Logger.debug( + "Jmol SAX EntityResolver not resolving:" + + "\n publicID: " + publicID + + "\n systemID: " + systemID + ); + } + return new InputSource(new BufferedReader(new StringReader(""))); + } + } + public class JmolXmlHandler extends DefaultHandler implements ErrorHandler { public JmolXmlHandler() { Modified: branches/v11_2/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_2/Jmol/src/org/jmol/viewer/Jmol.properties 2007-07-23 10:04:10 UTC (rev 7978) +++ branches/v11_2/Jmol/src/org/jmol/viewer/Jmol.properties 2007-07-23 10:08:40 UTC (rev 7979) @@ -1,5 +1,10 @@ version=11.2.5_dev +# bug fix: ACD/Labs nonstandard cml "builtin" property reader +# note that xmlReader (SAX reader) is now set to ignore all DOCTYPE declarations +# bug fix: odydata fix for files with \r\n for line ending +# bug fix for PDB remediated T/DT difference of C5M/C7 + # ----------------------------------------------------------------------------- #version=11.2.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |