Changeset 20811 for gli

Timestamp:

2009-10-12T21:20:59+13:00 (15 years ago)

Author:

ak19

Message:

showXMLParseFailureLine() now splits lines into an array which is used to display the erroneous line, rather than looping through lines based on the newline char which can break on the last line if this lacks a newline character.

File:

• gli/trunk/src/org/greenstone/gatherer/util/XMLTools.java (modified) (1 diff)

gli/trunk/src/org/greenstone/gatherer/util/XMLTools.java

@@ -520 +520 @@
         String line = "";
         int linenumber = e.getLineNumber();
-        DebugStream.println("\n****SAXParseException on LINE NUMBER: " + linenumber);
+        DebugStream.print("\n****SAXParseException on LINE NUMBER: " + linenumber);
         if(DebugStream.isDebuggingEnabled()) {
             if(linenumber != -1) { 
-                // find the line in xmlContents string (xmlContents is only set if GLI is run with debugging turned on)
-                int start = 0;
-                int end = xmlContents.length();
-                for(int i = 1; i <= linenumber; i++) {
-                    end = xmlContents.indexOf("\n");
-                    if(end > 0) {
-                        line = xmlContents.substring(start, end);
-                    }
-                    start = end+1;
-                }
+        String[] lines = xmlContents.split("\n");
+        if (lines.length > 0) {
+            DebugStream.println(" (number of lines: " + lines.length + ")");
+            if(lines.length >= linenumber) {
+            line = lines[linenumber-1];
+            } else { // error is past the last line
+            line = "Error is past the last line (" + lines.length + "): " + lines[lines.length-1];          
+            }
+        } else {
+            DebugStream.print("\n");
+        }
+        lines = null;
+
                 DebugStream.println("The parsing error occurred on this line:\n***********START\n" + line + "\n***********END");
                 DebugStream.println("SAXParseException message: " + e.getMessage() + "\n");