From: Egon W. <eg...@us...> - 2003-02-25 12:12:21
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/io In directory sc8-pr-cvs1:/tmp/cvs-serv2538/src/org/openscience/cdk/io Modified Files: ReaderFactory.java Log Message: Added earlier detection of CML to fix bug. The format must be detected before the 'mark read ahead' is passed. Reset is otherwise impossible Index: ReaderFactory.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/io/ReaderFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ReaderFactory.java 21 Feb 2003 12:08:04 -0000 1.2 +++ ReaderFactory.java 25 Feb 2003 12:12:11 -0000 1.3 @@ -88,10 +88,14 @@ logger.info("PDB format detected"); buffer.reset(); return new PDBReader(input); - } else if (line.indexOf("<atom") != -1) { + } else if ((line.indexOf("<atom") != -1) || + (line.indexOf("<molecule") != -1) || + (line.indexOf("<reaction") != -1) || + (line.indexOf("<cml") != -1) || + (line.indexOf("<bond") != -1)) { logger.info("CML format detected"); buffer.reset(); - return new CMLReader(input); + return new CMLReader(buffer); } else if (line.indexOf("<identifier") != -1) { logger.info("IChI format detected"); buffer.reset(); |