Changeset 236

Timestamp:

10/05/11 01:06:02 (13 years ago)

Author:

sherbold

Message:

• improved parameter checking of command loadSessionsFromClickstream

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java (modified) (3 diffs)

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

@@ -34 +34 @@
                         throw new InvalidParameterException();
                 }
-                String source = (String) parameters.get(0);
-                String sequencesName = (String) parameters.get(1);
+                String source;
+                String sequencesName;
                 String serverUrl = null;
                 int timeout = -1;
@@ -42 +42 @@
                 boolean generateFrequentUsers = false;
                 int frequentUserThreshold = 20;
-                if (parameters.size() >= 3) {
-                        serverUrl = (String) parameters.get(2);
-                }
-                if (parameters.size() >= 6) {
-                        timeout = Integer.parseInt((String) parameters.get(3));
-                        minLength = Integer.parseInt((String) parameters.get(4));
-                        maxLength = Integer.parseInt((String) parameters.get(5));
-                }
-                if (parameters.size() >= 8) {
-                        generateFrequentUsers = Boolean.parseBoolean((String) parameters
-                                        .get(6));
-                        frequentUserThreshold = Integer
-                                        .parseInt((String) parameters.get(7));
+                try {
+                        source = (String) parameters.get(0);
+                        sequencesName = (String) parameters.get(1);
+                        if (parameters.size() >= 3) {
+                                serverUrl = (String) parameters.get(2);
+                        }
+                        if (parameters.size() >= 6) {
+                                timeout = Integer.parseInt((String) parameters.get(3));
+                                minLength = Integer.parseInt((String) parameters.get(4));
+                                maxLength = Integer.parseInt((String) parameters.get(5));
+                        }
+                        if (parameters.size() >= 8) {
+                                generateFrequentUsers = Boolean
+                                                .parseBoolean((String) parameters.get(6));
+                                frequentUserThreshold = Integer.parseInt((String) parameters
+                                                .get(7));
+                        }
+                } catch (Exception e) {
+                        throw new InvalidParameterException();
                 }
 
@@ -89 +95 @@
                                         .getFrequentUserSequences();
                         for (int i = 0; i < frequentUserIDs.size(); i++) {
-                                GlobalDataContainer.getInstance().addData(
+                                if (GlobalDataContainer.getInstance().addData(
                                                 sequencesName + "_" + frequentUserIDs.get(i),
-                                                frequentUserSessions.get(i));
+                                                frequentUserSessions.get(i))) {
+                                        Console.traceln("Old data \"" + sequencesName
+                                                        + "\" overwritten");
+                                }
                         }
                 }