Changeset 1234 for trunk

Timestamp:

06/27/13 17:13:26 (11 years ago)

Author:

pharms

Message:

• corrected log compression and log file restructuring

Location:

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html

Files:

• AbstractDefaultLogParser.java (modified) (1 diff)
• HTMLLogCompressor.java (modified) (2 diffs)

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/AbstractDefaultLogParser.java

@@ -205 +205 @@
                 throw new SAXParseException("Error parsing file " + file.getName(), locator, e);
             }
+            catch (SAXParseException e) {
+                if ("XML document structures must start and end within the same entity.".equals
+                    (e.getMessage()))
+                {
+                    // this only denotes, that the final session tag is missing, because the
+                    // file wasn't completed. Ignore this.
+                }
+                else {
+                    throw e;
+                }
+            }
         }
     }

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogCompressor.java

@@ -143 +143 @@
                     catch (Exception e) {
                         Console.printerrln("could not parse and compress file " + file);
+                        Console.printerrln(e.getMessage());
                     }
                 }
@@ -170 +171 @@
         }
         
-        for (File file : compressedFiles) {
-            if (!file.delete()) {
-                Console.printerrln("could not delete compressed file " + file);
-            }
-        }
-        
-        if (outFile.exists()) {
-            File finalOutFile = null;
-            
-            logFileIndex = -1;
-            do {
-                logFileIndex++;
-                finalOutFile =
-                    new File(directory, getLogFileName(directory.getName(), logFileIndex));
-            }
-            while (finalOutFile.exists());
-
-            outFile.renameTo(finalOutFile);
-            Console.println("created " + finalOutFile);
+        if (compressedFiles.size() > 0) {
+            for (File file : compressedFiles) {
+                if (!file.delete()) {
+                    Console.printerrln("could not delete compressed file " + file);
+                }
+            }
+        
+            if (outFile.exists()) {
+                File finalOutFile = null;
+            
+                logFileIndex = -1;
+                do {
+                    logFileIndex++;
+                    finalOutFile =
+                        new File(directory, getLogFileName(directory.getName(), logFileIndex));
+                }
+                while (finalOutFile.exists());
+
+                outFile.renameTo(finalOutFile);
+                Console.println("created " + finalOutFile);
+            }
+        }
+        else {
+            outFile.delete();
         }
     }