Changeset 554 for trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/php/WeblogParser.java

Timestamp:

08/16/12 17:08:27 (12 years ago)

Author:

sherbold

Message:

• adapted PHP plugin event structure to new event structure

File:

• trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/php/WeblogParser.java (modified) (12 diffs)

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/php/WeblogParser.java

@@ -16 +16 @@
 import java.util.Set;
 
-import de.ugoe.cs.quest.plugin.php.eventcore.WebEvent;
+import de.ugoe.cs.quest.eventcore.Event;
+import de.ugoe.cs.quest.eventcore.IEventTarget;
+import de.ugoe.cs.quest.eventcore.IEventType;
+import de.ugoe.cs.quest.plugin.php.eventcore.PHPEventTarget;
+import de.ugoe.cs.quest.plugin.php.eventcore.PHPEventType;
+import de.ugoe.cs.quest.plugin.php.eventcore.WebRequest;
 import de.ugoe.cs.util.FileTools;
 import de.ugoe.cs.util.console.Console;
@@ -67 +72 @@
          * </p>
          */
-        private List<List<WebEvent>> sequences;
+        private List<List<Event>> sequences;
 
         /**
@@ -90 +95 @@
          * </p>
          */
-        private List<Collection<List<WebEvent>>> sequencesFrequentUsers;
+        private List<Collection<List<Event>>> sequencesFrequentUsers;
 
         /**
@@ -145 +150 @@
          * @return generated event sequences
          */
-        public Collection<List<WebEvent>> getSequences() {
+        public Collection<List<Event>> getSequences() {
                 return sequences;
         }
@@ -232 +237 @@
          * @return list of the sequences of all frequent users
          */
-        public List<Collection<List<WebEvent>>> getFrequentUserSequences() {
+        public List<Collection<List<Event>>> getFrequentUserSequences() {
                 return sequencesFrequentUsers;
         }
@@ -255 +260 @@
 
                 Map<String, List<Integer>> cookieSessionMap = new HashMap<String, List<Integer>>();
+                Map<String, Long> cookieTimestampMap = new HashMap<String, Long>();
+                
                 int lastId = -1;
 
@@ -261 +268 @@
                 loadRobotRegex();
 
-                sequences = new ArrayList<List<WebEvent>>();
+                sequences = new ArrayList<List<Event>>();
                 users = new ArrayList<String>();
 
@@ -298 +305 @@
                                         List<String> getVars = extractGetVarsFromUri(uri);
                                         
-                                        WebEvent event = new WebEvent(url, path, timestamp,
-                                                        postedVars, getVars);
+                                        IEventType type = new PHPEventType(path, postedVars, getVars);
+                                        IEventTarget target = new PHPEventTarget(path);
+                                        Event event = new Event(type, target);
+                                        event.addReplayable(new WebRequest(url, path, postedVars, getVars));
 
                                         // find session and add event
@@ -308 +317 @@
                                                 sessionIds.add(++lastId);
                                                 cookieSessionMap.put(cookie, sessionIds);
-                                                sequences.add(new LinkedList<WebEvent>());
+                                                sequences.add(new LinkedList<Event>());
                                                 users.add(cookie);
                                         }
                                         Integer lastSessionIndex = sessionIds
                                                         .get(sessionIds.size() - 1);
-                                        List<WebEvent> lastSession = sequences
+                                        List<Event> lastSession = sequences
                                                         .get(lastSessionIndex);
                                         long lastEventTime = timestamp;
                                         if (!lastSession.isEmpty()) {
-                                                lastEventTime = lastSession.get(lastSession.size() - 1)
-                                                                .getTimestamp();
+                                                lastEventTime = cookieTimestampMap.get(cookie);
                                         }
                                         if (timestamp - lastEventTime > timeout) {
                                                 sessionIds.add(++lastId);
-                                                List<WebEvent> newSession = new LinkedList<WebEvent>();
+                                                List<Event> newSession = new LinkedList<Event>();
                                                 newSession.add(event);
                                                 sequences.add(newSession);
@@ -329 +337 @@
                                                 lastSession.add(event);
                                         }
+                                        cookieTimestampMap.put(cookie, timestamp);
                                 } catch (URISyntaxException e) {
                                         Console.traceln("Ignored line " + lineCounter + ": "
@@ -358 +367 @@
         private void generateFrequentUserSequences(Set<String> uniqueUsers) {
                 frequentUsers = new ArrayList<String>();
-                sequencesFrequentUsers = new ArrayList<Collection<List<WebEvent>>>();
+                sequencesFrequentUsers = new ArrayList<Collection<List<Event>>>();
                 for (String user : uniqueUsers) {
                         List<String> tmp = new ArrayList<String>();
@@ -367 +376 @@
                         if (size >= frequentUsersThreshold) {
                                 frequentUsers.add(user);
-                                Collection<List<WebEvent>> sequencesUser = new ArrayList<List<WebEvent>>();
+                                Collection<List<Event>> sequencesUser = new ArrayList<List<Event>>();
                                 for (int i = 0; i < sequences.size(); i++) {
                                         if (users.get(i).equals(user)) {