Changeset 1496 for trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands
- Timestamp:
- 04/11/14 12:12:52 (10 years ago)
- Location:
- trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcorrectHTMLLogDirs.java
r1339 r1496 17 17 import java.io.File; 18 18 import java.util.Arrays; 19 import java.util.HashMap;20 19 import java.util.List; 21 20 import java.util.logging.Level; … … 91 90 String serverName = null; 92 91 93 HTMLLogParser parser = new HTMLLogParser(n ew HashMap<String, List<String>>());92 HTMLLogParser parser = new HTMLLogParser(null); 94 93 try { 95 94 parser.parseFile(file); -
trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java
r1435 r1496 18 18 import java.util.Arrays; 19 19 import java.util.Collection; 20 import java.util.HashMap;21 import java.util.LinkedList;22 20 import java.util.List; 23 import java.util.Map;24 21 import java.util.logging.Level; 25 22 import java.util.regex.Matcher; … … 55 52 String path = null; 56 53 String sequencesName = null; 57 Map<String, List<String>> parseParams = new HashMap<String, List<String>>();54 String parseParamFile = null; 58 55 59 56 try { … … 69 66 } 70 67 else { 71 Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w =\\[\\]\\(\\)/\\.-]*)");68 Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w/\\.-]*)"); 72 69 Matcher matcher = parseParamPattern.matcher(param); 73 70 74 71 if (matcher.matches()) { 75 72 String key = matcher.group(1); 76 List<String> values = parseParams.get(key); 77 78 if (values == null) { 79 values = new LinkedList<String>(); 80 parseParams.put(key, values); 73 if (!"parseParamFile".equals(key)) { 74 String message = "unknown parameter: " + key; 75 Console.printerrln(message); 76 throw new IllegalArgumentException(message); 81 77 } 82 78 83 values.add(matcher.group(2));79 parseParamFile = matcher.group(2); 84 80 } 85 81 else { 86 String message = "par se parameter does not follow format: -<key>=<value>";82 String message = "parameter does not follow format: -<key>=<value>"; 87 83 Console.printerrln(message); 88 84 throw new IllegalArgumentException(message); … … 105 101 } 106 102 107 HTMLLogParser parser = new HTMLLogParser(parseParam s);103 HTMLLogParser parser = new HTMLLogParser(parseParamFile); 108 104 109 105 parseFile(folder, parser); … … 161 157 @Override 162 158 public String help() { 163 return "parseDirHTML <directory> [<sequencesName>] " + 164 "{-idReplacements=path/to/replacementfile} {-clearId=path/to[0]/gui(htmlId=element)} " + 165 "{-clearIndex=path/to[0]/gui(htmlId=element)}"; 159 return "parseDirHTML <directory> [<sequencesName>] {-parseParams=path/to/parseParamsFile}"; 166 160 } 167 161 -
trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseHTML.java
r1435 r1496 16 16 17 17 import java.util.Collection; 18 import java.util.HashMap;19 import java.util.LinkedList;20 18 import java.util.List; 21 import java.util.Map;22 19 import java.util.regex.Matcher; 23 20 import java.util.regex.Pattern; … … 50 47 String filename = null; 51 48 String sequencesName = null; 52 Map<String, List<String>> parseParams = new HashMap<String, List<String>>();49 String parseParamFile = null; 53 50 54 51 try { … … 64 61 } 65 62 else { 66 Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w =\\[\\]\\(\\)/\\.-]*)");63 Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w/\\.-]*)"); 67 64 Matcher matcher = parseParamPattern.matcher(param); 68 65 69 66 if (matcher.matches()) { 70 67 String key = matcher.group(1); 71 List<String> values = parseParams.get(key); 72 73 if (values == null) { 74 values = new LinkedList<String>(); 75 parseParams.put(key, values); 68 if (!"parseParamFile".equals(key)) { 69 String message = "unknown parameter: " + key; 70 Console.printerrln(message); 71 throw new IllegalArgumentException(message); 76 72 } 77 73 78 values.add(matcher.group(2));74 parseParamFile = matcher.group(2); 79 75 } 80 76 else { 81 String message = "par se parameter does not follow format: -<key>=<value>";77 String message = "parameter does not follow format: -<key>=<value>"; 82 78 Console.printerrln(message); 83 79 throw new IllegalArgumentException(message); … … 94 90 } 95 91 96 HTMLLogParser parser = new HTMLLogParser(parseParam s);92 HTMLLogParser parser = new HTMLLogParser(parseParamFile); 97 93 98 94 try { … … 124 120 @Override 125 121 public String help() { 126 return "parseHTML <filename> [<sequencesName>] " + 127 "{-idReplacements=path/to/replacementfile} {-clearId=path/to[0]/gui(htmlId=element)} " + 128 "{-clearIndex=path/to[0]/gui(htmlId=element)}"; 122 return "parseHTML <filename> [<sequencesName>] {-parseParams=path/to/parseParamsFile}"; 129 123 } 130 124
Note: See TracChangeset
for help on using the changeset viewer.