From bbb708105b77e94b8ae1de4a9a70f5ea08da21d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Tue, 13 Jan 2015 07:34:06 +0000
Subject: [PATCH] - improved logging (level and exceptions)

---
 .../inrialpes/exmo/align/parser/AlignmentParser.java   | 10 +++++++---
 src/fr/inrialpes/exmo/align/parser/XMLParser.java      |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/fr/inrialpes/exmo/align/parser/AlignmentParser.java b/src/fr/inrialpes/exmo/align/parser/AlignmentParser.java
index f2cf2c8c..f1457302 100644
--- a/src/fr/inrialpes/exmo/align/parser/AlignmentParser.java
+++ b/src/fr/inrialpes/exmo/align/parser/AlignmentParser.java
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Copyright (C) INRIA, 2003-2005, 2007-2010, 2012-2014
+ * Copyright (C) INRIA, 2003-2005, 2007-2010, 2012-2015
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -128,19 +128,23 @@ public class AlignmentParser {
 	    //alignment = parser.parse( o );
 	    alignment = callParser( parser, o );
 	} catch ( Exception e ) {
-	    logger.debug( "XMLParser failed to parse alignment (INFO)", e );
-	    logger.debug( "Using RDFParser instead" );
+	    logger.debug( "XMLParser failed to parse alignment (INFO)" );
 	    try {
 		if ( !embedded ) {
+		    logger.debug( "Using RDFParser instead (log=TRACE to see exception)" );
 		    RDFParser rparser = new RDFParser();
 		    alignment = callParser( rparser, o );
 		} else {
+		    logger.debug( "Cannot parse further" );
 		    throw new AlignmentException( "Cannot parse "+o+" (use logging for more info)", e );
 		}
 	    } catch ( Exception ex ) {
 		// JE: should contain both ex and e
+		logger.debug( "XMLParser throw exception", e );
+		logger.debug( "RDFParser throw exception", ex );
 		throw new AlignmentException( "Cannot parse "+o, ex );
 	    }
+	    logger.trace( "This exception was caught and is not critical", e );
 	}
 	return alignment;
     }
diff --git a/src/fr/inrialpes/exmo/align/parser/XMLParser.java b/src/fr/inrialpes/exmo/align/parser/XMLParser.java
index 3b9d1a69..50a1b7a5 100644
--- a/src/fr/inrialpes/exmo/align/parser/XMLParser.java
+++ b/src/fr/inrialpes/exmo/align/parser/XMLParser.java
@@ -270,7 +270,7 @@ public class XMLParser extends DefaultHandler {
    * @param atts 					The attributes name of the current element 
    */
     public void startElement( String namespaceURI, String pName, String qname, Attributes atts ) throws SAXException {
-	logger.debug( "startElement XMLParser : {}", pName );
+	logger.trace( "startElement XMLParser : {}", pName );
 	parseLevel++;
 	if( namespaceURI.equals( Namespace.ALIGNMENT.uri+"#" )
 	    || namespaceURI.equals( Namespace.ALIGNMENT.uri ) )  {
@@ -392,7 +392,7 @@ public class XMLParser extends DefaultHandler {
 	} else {
 	    content = newContent; 
 	}
-	logger.debug( "content XMLParser : {}", content );
+	logger.trace( "content XMLParser : {}", content );
     }
 
     /** 
@@ -403,7 +403,7 @@ public class XMLParser extends DefaultHandler {
      * @param qName					The name of the current element 
      */
     public  void endElement(String namespaceURI, String pName, String qName ) throws SAXException {
-	logger.debug( "endElement XMLParser : {}", pName );
+	logger.trace( "endElement XMLParser : {}", pName );
 	if( namespaceURI.equals( Namespace.ALIGNMENT.uri+"#" )
 	    || namespaceURI.equals( Namespace.ALIGNMENT.uri ) )  {
 	    try {
-- 
GitLab