From: Egon W. <eg...@us...> - 2003-08-27 17:33:45
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/validate In directory sc8-pr-cvs1:/tmp/cvs-serv28181/src/org/openscience/cdk/validate Modified Files: DictionaryValidator.java Log Message: More debug info and more details in errors Index: DictionaryValidator.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/validate/DictionaryValidator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DictionaryValidator.java 25 Aug 2003 08:57:40 -0000 1.1 +++ DictionaryValidator.java 27 Aug 2003 17:33:39 -0000 1.2 @@ -26,6 +26,7 @@ import org.openscience.cdk.*; import org.openscience.cdk.dict.*; +import org.openscience.cdk.tools.LoggingTool; import java.util.Map; import java.util.Iterator; @@ -37,6 +38,12 @@ */ public class DictionaryValidator implements ValidatorInterface { + private static LoggingTool logger; + + static { + logger = new LoggingTool("org.openscience.cdk.validate.DictionaryValidator"); + } + private DictionaryDatabase db; public DictionaryValidator(DictionaryDatabase db) { @@ -62,7 +69,7 @@ String keyName = (String)key; if (keyName.startsWith(DictionaryDatabase.DICTREFPROPERTYNAME)) { String dictRef = (String)properties.get(keyName); - String details = "Dictref being anaylyzed: " + dictRef; + String details = "Dictref being anaylyzed: " + dictRef + ". "; noNamespace.setDetails(details); noDict.setDetails(details); noEntry.setDetails(details); @@ -70,10 +77,12 @@ if (index != -1) { report.addOK(noNamespace); String dict = dictRef.substring(0,index); + logger.debug("Looking for dictionary:" + dict); if (db.hasDictionary(dict)) { report.addOK(noDict); if (dictRef.length() > index+1) { String entry = dictRef.substring(index+1); + logger.debug("Looking for entry:" + entry); if (db.hasEntry(dict, entry)) { report.addOK(noEntry); } else { @@ -83,11 +92,15 @@ report.addError(noEntry); } } else { + details += "The dictionary searched: " + dict + "."; + noDict.setDetails(details); report.addError(noDict); report.addError(noEntry); } } else { // The dictRef has no namespace + details += "There is not a namespace given."; + noNamespace.setDetails(details); report.addError(noNamespace); report.addError(noDict); report.addError(noEntry); |