Changeset 74 for trunk/EventBenchConsole

Timestamp:

06/16/11 14:16:36 (14 years ago)

Author:

sherbold

Message:

• refactoring

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench

Files:

• web/WeblogParser.java (modified) (5 diffs)
• windows/LogPreprocessor.java (modified) (2 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/WeblogParser.java

@@ -14 +14 @@
 
 import de.ugoe.cs.eventbench.web.data.WebEvent;
+import de.ugoe.cs.util.FileTools;
 import de.ugoe.cs.util.console.Console;
 
@@ -49 +50 @@
         
         public void parseFile(String filename) throws IOException, FileNotFoundException, ParseException {
-                File f = new File(filename);
-                FileReader reader = new FileReader(f);
-                char[] buffer = new char[(int) f.length()];
-                reader.read(buffer);
-                reader.close();
-                String[] lines = (new String(buffer)).split("\r\n");
+                String[] lines = FileTools.getLinesFromFile(filename);
                 
                 Map<String, List<Integer>> cookieSessionMap = new HashMap<String, List<Integer>>();
@@ -109 +105 @@
                         }
                 }
+                pruneShortSequences();
+        }
+
+        private void pruneShortSequences() {
                 Console.traceln(""+sequences.size()+ " user sequences found");
                 // prune sequences shorter than min-length
@@ -116 +116 @@
                                 sequences.remove(i);
                         } else {
-                                Console.traceln(""+sequences.get(i).size());
-                                if( sequences.get(i).size() > 152 ) {
-                                        Console.traceln(sequences.get(i).toString().replaceAll(", ", "\n"));
-                                }
                                 i++;
                         }
@@ -127 +123 @@
         
         private void loadRobotRegex() throws IOException, FileNotFoundException {
-                File f = new File(ROBOTFILTERFILE);
-                FileReader reader = new FileReader(f);
-                char[] buffer = new char[(int) f.length()];
-                reader.read(buffer);
-                reader.close();
-                String[] lines = (new String(buffer)).split("\r\n");
+                String[] lines = FileTools.getLinesFromFile(ROBOTFILTERFILE);
                 StringBuilder regex = new StringBuilder();
                 for( int i=0; i<lines.length; i++ ) {

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/LogPreprocessor.java

@@ -10 +10 @@
 import org.apache.commons.codec.binary.Base64;
 
+import de.ugoe.cs.util.FileTools;
 import de.ugoe.cs.util.StringTools;
 import de.ugoe.cs.util.console.Console;
@@ -65 +66 @@
         private void processFile(String source, OutputStreamWriter targetFile)
                         throws FileNotFoundException, IOException {
-                File f = new File(source);
-                FileReader reader = new FileReader(f);
-                char[] buffer = new char[(int) f.length()];
-                reader.read(buffer);
-                reader.close();
-                String[] lines = (new String(buffer)).split("\n");
+                String[] lines = FileTools.getLinesFromFile(source, false);
                 String incompleteLine = "";
                 // Open source and read line by line