Changeset 1339 for trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands

Timestamp:

01/28/14 16:08:11 (10 years ago)

Author:

pharms

Message:

• added support for parameterizing the parsing of GUI models to ignore ids or indexes

Location:

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands

Files:

• CMDcorrectHTMLLogDirs.java (modified) (2 diffs)
• CMDparseDirHTML.java (modified) (4 diffs)
• CMDparseHTML.java (modified) (2 diffs)

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcorrectHTMLLogDirs.java

@@ -17 +17 @@
 import java.io.File;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.logging.Level;
@@ -90 +91 @@
             String serverName = null;
             
-            HTMLLogParser parser = new HTMLLogParser();
+            HTMLLogParser parser = new HTMLLogParser(new HashMap<String, List<String>>());
             try {
                 parser.parseFile(file);

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java

@@ -18 +18 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import de.ugoe.cs.autoquest.CommandHelpers;
@@ -48 +53 @@
     @Override
     public void run(List<Object> parameters) {
-        String path;
-        String sequencesName = "sequences";
+        String path = null;
+        String sequencesName = null;
+        Map<String, List<String>> parseParams = new HashMap<String, List<String>>();
 
         try {
-            path = (String) parameters.get(0);
-            if (parameters.size() >= 2) {
-                sequencesName = (String) parameters.get(1);
+            for (int i = 0; i < parameters.size(); i++) {
+                String param = (String) parameters.get(i);
+                if (!param.startsWith("-")) {
+                    if (path == null) {
+                        path = param;
+                    }
+                    else if (sequencesName == null) {
+                        sequencesName = param;
+                    }
+                }
+                else {
+                    Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/]*)");
+                    Matcher matcher = parseParamPattern.matcher(param);
+                    
+                    if (matcher.matches()) {
+                        String key = matcher.group(1);
+                        List<String> values = parseParams.get(key);
+                        
+                        if (values == null) {
+                            values = new LinkedList<String>();
+                            parseParams.put(key, values);
+                        }
+                        
+                        values.add(matcher.group(2));
+                    }
+                    else {
+                        String message = "parse parameter does not follow format: -<key>=<value>";
+                        Console.printerrln(message);
+                        throw new IllegalArgumentException(message);
+                    }
+                }
             }
         }
         catch (Exception e) {
             throw new IllegalArgumentException("illegal parameters provided: " + e);
+        }
+        
+        if (sequencesName == null) {
+            sequencesName = "sequences";
         }
 
@@ -67 +105 @@
         }
 
-        HTMLLogParser parser = new HTMLLogParser();
+        HTMLLogParser parser = new HTMLLogParser(parseParams);
 
         parseFile(folder, parser);
@@ -123 +161 @@
     @Override
     public String help() {
-        return "parseDirHTML <directory> {<sequencesName>}";
+        return "parseDirHTML <directory> {<sequencesName>} {<clearId>} {<clearIndex>}";
     }
 

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseHTML.java

@@ -16 +16 @@
 
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import de.ugoe.cs.autoquest.CommandHelpers;
@@ -43 +48 @@
     @Override
     public void run(List<Object> parameters) {
-        String filename;
-        String sequencesName = "sequences";
+        String filename = null;
+        String sequencesName = null;
+        Map<String, List<String>> parseParams = new HashMap<String, List<String>>();
 
         try {
-            filename = (String) parameters.get(0);
-            if (parameters.size() >= 2) {
-                sequencesName = (String) parameters.get(1);
+            for (int i = 0; i < parameters.size(); i++) {
+                String param = (String) parameters.get(i);
+                if (!param.startsWith("-")) {
+                    if (filename == null) {
+                        filename = param;
+                    }
+                    else if (sequencesName == null) {
+                        sequencesName = param;
+                    }
+                }
+                else {
+                    Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/]*)");
+                    Matcher matcher = parseParamPattern.matcher(param);
+                    
+                    if (matcher.matches()) {
+                        String key = matcher.group(1);
+                        List<String> values = parseParams.get(key);
+                        
+                        if (values == null) {
+                            values = new LinkedList<String>();
+                            parseParams.put(key, values);
+                        }
+                        
+                        values.add(matcher.group(2));
+                    }
+                    else {
+                        String message = "parse parameter does not follow format: -<key>=<value>";
+                        Console.printerrln(message);
+                        throw new IllegalArgumentException(message);
+                    }
+                }
             }
         }
         catch (Exception e) {
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException("illegal parameters provided: " + e);
         }
 
-        HTMLLogParser parser = new HTMLLogParser();
+        if (sequencesName == null) {
+            sequencesName = "sequences";
+        }
+
+        HTMLLogParser parser = new HTMLLogParser(parseParams);
 
         try {