Changeset 183 for trunk

Timestamp:

09/14/11 19:24:58 (13 years ago)

Author:

sherbold

Message:

• changed commands for reading sequences to accept a parameter that defines the storage name for these sequences; default: "sequences"

Location:

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

Files:

• web/commands/CMDloadSessionsFromClickstream.java (modified) (4 diffs)
• windows/commands/CMDparseXML.java (modified) (3 diffs)

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

@@ -16 +16 @@
  * Command to load sessions from a web log.
  * </p>
+ * 
  * @author Steffen Herbold
  * @version 1.0
@@ -21 +22 @@
 public class CMDloadSessionsFromClickstream implements Command {
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see de.ugoe.cs.util.console.Command#run(java.util.List)
          */
         @Override
         public void run(List<Object> parameters) {
-                if( parameters.size() < 1 ) {
+                if (parameters.size() < 1) {
                         throw new InvalidParameterException();
                 }
@@ -32 +35 @@
                 int timeout = -1;
                 int minLength = -1;
-                if( parameters.size() ==3 ) {
+                String sequencesName = "sequences";
+                if (parameters.size() >= 3) {
                         timeout = Integer.parseInt((String) parameters.get(1));
                         minLength = Integer.parseInt((String) parameters.get(2));
                 }
-                
+                if (parameters.size() >= 4) {
+                        sequencesName = (String) parameters.get(3);
+                }
+
                 WeblogParser parser = new WeblogParser();
-                if( timeout!=-1 ) {
+                if (timeout != -1) {
                         parser.setTimeout(timeout);
                         parser.setMinLength(minLength);
@@ -51 +58 @@
                         Console.println("Invalid format of date stamps.");
                         Console.println(e.getMessage());
-                } 
-                
-                if( GlobalDataContainer.getInstance().addData("sequences", parser.getSequences()) ) {
-                        Console.traceln("Old data \"" + "sequences" + "\" overwritten");
+                }
+
+                if (GlobalDataContainer.getInstance().addData(sequencesName,
+                                parser.getSequences())) {
+                        Console.traceln("Old data \"" + sequencesName + "\" overwritten");
                 }
         }
-        
-        /* (non-Javadoc)
+
+        /*
+         * (non-Javadoc)
+         * 
          * @see de.ugoe.cs.util.console.Command#help()
          */
         @Override
         public void help() {
-                Console.println("Usage: loadSessionsFromClickstream <filename> {<timeout> <minSessionLength>}");
+                Console.println("Usage: loadSessionsFromClickstream <filename> {<timeout> <minSessionLength>} {<sequencesName>}");
         }
 

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java

@@ -21 +21 @@
 public class CMDparseXML implements Command {
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see de.ugoe.cs.util.console.Command#help()
          */
         @Override
         public void help() {
-                Console.println("Usage: parseXML <filename> {<countMessageOccurences}");
+                Console.println("Usage: parseXML <filename> {<sequencesName>} {<countMessageOccurences>}");
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see de.ugoe.cs.util.console.Command#run(java.util.List)
          */
@@ -35 +39 @@
         public void run(List<Object> parameters) {
                 String filename;
+                String sequencesName = "sequences";
                 boolean countMessageOccurences = false;
 
                 try {
                         filename = (String) parameters.get(0);
-                        if (parameters.size() == 2) {
+                        if (parameters.size() >= 2) {
+                                sequencesName = (String) parameters.get(1);
+                        }
+                        if (parameters.size() >= 3) {
                                 countMessageOccurences = Boolean
-                                                .parseBoolean((String) parameters.get(1));
+                                                .parseBoolean((String) parameters.get(2));
                         }
                 } catch (Exception e) {
@@ -52 +60 @@
                 List<List<WindowsEvent>> sequences = parser.getSequences();
 
-                if (GlobalDataContainer.getInstance().addData("sequences", sequences)) {
-                        Console.traceln("Old data \"" + "sequences" + "\" overwritten");
+                if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
+                        Console.traceln("Old data \"" + sequencesName + "\" overwritten");
                 }
         }