Changeset 1496 for trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java
- Timestamp:
- 04/11/14 12:12:52 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
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
Note: See TracChangeset
for help on using the changeset viewer.