perfsonar development work

Author: dante.delvaux
Date: 2013-04-28 17:05:16 +0100 (Sun, 28 Apr 2013)
New Revision: 6263

Modified:
   
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/DataParser.java
   
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/MetadataParser.java
Log:
nmwg-sql-converter: even better error reporting in case the XML is badly 
formated.  See PSSERVICES-669

Modified: 
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/DataParser.java
===================================================================
--- 
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/DataParser.java
  2013-04-27 18:02:15 UTC (rev 6262)
+++ 
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/DataParser.java
  2013-04-28 16:05:16 UTC (rev 6263)
@@ -46,7 +46,7 @@
                        sp.parse(file, this);
         } catch (SAXParseException se) {
             logger.error("Error parsing the incoming XML in the data 
section, check that input is a valid XML file.", false);
-            logger.error("Line " + se.getLineNumber() + ": " + 
se.getMessage(), false);
+            logger.error("Line " + se.getLineNumber() + ", column " + 
se.getColumnNumber() + ": " + se.getMessage(), false);
             logger.warning("The conversion of the XML configuration file is 
probably not complete.", false);
                } catch(SAXException se) {
                        se.printStackTrace();

Modified: 
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/MetadataParser.java
===================================================================
--- 
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/MetadataParser.java
      2013-04-27 18:02:15 UTC (rev 6262)
+++ 
trunk/nmwg-sql-converter/src/main/java/org/perfsonar/nmwg/converter/parser/MetadataParser.java
      2013-04-28 16:05:16 UTC (rev 6263)
@@ -39,7 +39,7 @@
                        sp.parse(file, this);
                } catch (SAXParseException se) {
                    logger.error("Error parsing the incoming XML in the 
Metadata section, check that input is a valid XML file.", false);
-                   logger.error("Line " + se.getLineNumber() + ": " + 
se.getMessage(), false);
+                   logger.error("Line " + se.getLineNumber() + ", column " + 
se.getColumnNumber() + ": " + se.getMessage(), false);
             logger.warning("The conversion of the XML configuration file is 
probably not complete.", false);
                } catch(SAXException se) {
                        se.printStackTrace();