Changeset 53 for trunk/EventBenchConsole/src/de

Timestamp:

06/09/11 15:06:49 (14 years ago)

Author:

sherbold

Message:

• experimental parsing of web usage logs

Location:

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

Files:

• commands/CMDloadSessionsFromClickstream.java (modified) (7 diffs)
• data/WebEvent.java (modified) (1 diff)
• data/WebRequest.java (added)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java

@@ -6 +6 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -12 +11 @@
 import java.util.Map;
 
-import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.web.data.WebEvent;
 import de.ugoe.cs.util.console.Command;
@@ -22 +20 @@
         public void run(List<Object> parameters) {
                 // TODO Auto-generated method stub
-                if( parameters.size() < 2 ) {
+                if( parameters.size() < 1 ) {
                         throw new InvalidParameterException();
                 }
@@ -45 +43 @@
                         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                         
-                        for( int i=0; i<lines.length ; i++ ) {
-                                String[] values = lines[i].split(" ");
+                        for( String line : lines ) {
+                                String[] values = line.trim().split(" ");
                                 
                                 // use cookie as session identifier
@@ -54 +52 @@
                                 long timestamp = dateFormat.parse(dateString).getTime();
                                 String uri = values[3];
+                                String ref = values[4];
+                                List<String> postedVars = new ArrayList<String>();
+                                for( int i=5 ; i<values.length ; i++ ) {
+                                        postedVars.add(values[i]);
+                                }
                                 
+                                        
+                                WebEvent event = new WebEvent(uri, timestamp, postedVars);
+                                
+                                
+                                // find session and add event
                                 List<Integer> sessionIds = cookieSessionMap.get(cookie);
                                 if( sessionIds==null ) {
@@ -72 +80 @@
                                         sessionIds.add(++lastId);
                                         List<WebEvent> newSession = new LinkedList<WebEvent>();
-                                        newSession.add(new WebEvent(uri, timestamp));
+                                        newSession.add(event);
                                         sessions.add(newSession);
                                 } else {
-                                        lastSession.add(new WebEvent(uri, timestamp));
+                                        lastSession.add(event);
                                 }
                         } 
@@ -84 +92 @@
                 
         }
-
+        
         @Override
         public void help() {

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/data/WebEvent.java

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.web.data;
 
-import de.ugoe.cs.eventbench.data.Event;
+import java.util.List;
 
-public class WebEvent extends Event<String> {
+import de.ugoe.cs.eventbench.data.ReplayableEvent;
+
+public class WebEvent extends ReplayableEvent<WebRequest> {
 
         private final long timestamp;
+        private String uri;
         
-        public WebEvent(String type, long timestamp) {
-                super(type);
+        private final static String makeType(String uri, List<String> postVars) {
+                String type = uri;
+                if( postVars!=null && !postVars.isEmpty() ) {
+                        type += postVars.toString().replace(" ", "");
+                }
+                return type;
+        }
+        
+        public WebEvent(String uri, long timestamp, List<String> postVars) {
+                super(makeType(uri, postVars));
                 this.timestamp = timestamp;
+                this.uri = uri;
+                addReplayEvent(new WebRequest(uri, postVars));
         }