Changeset 1965 for trunk/autoquest-plugin-html/src

Timestamp:

06/12/15 13:50:34 (10 years ago)

Author:

pharms

Message:

• extended path matching for ID mapping files to also match the beginning of a path

File:

• trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParser.java (modified) (4 diffs)

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

@@ -661 +661 @@
             !"colgroup".equals(tagName) && !"col".equals(tagName) && !"hr".equals(tagName) &&
             !"param".equals(tagName) && !"sfmsg".equals(tagName) &&
-            !"wappalyzerdata".equals(tagName);
+            !"wappalyzerdata".equals(tagName)&& !"mytubeelement".equals(tagName);
 
     }
@@ -729 +729 @@
          */
         private Pattern htmlElementSpecPattern = Pattern.compile
-            ("(document\\(path=([\\w/\\-#$&%\\.]+)\\))|((\\w+)(\\[(\\d+)\\]|\\(htmlId=([\\w\\-_#]+)\\))?)");
+            ("(document\\(path=([\\w/\\-\\^#$&%\\.]+)\\))|((\\w+)(\\[(\\d+)\\]|\\(htmlId=([\\w\\-_#]+)\\))?)");
         
         /**
@@ -1007 +1007 @@
                 // check if the path condition would match with ignoring specific characters
                 
+                boolean mustMatchBeginning = pathPart.charAt(0) == '^';
                 boolean mustMatchAtEnd = pathPart.charAt(pathPart.length() - 1) == '$';
 
                 int indexInPath = 0;
-                int indexInPathPart = 0;
+                int indexInPathPart = mustMatchBeginning ? 1 : 0;
 
                 while (indexInPath < path.length()) {
@@ -1025 +1026 @@
                             return true;
                         }
+                    }
+                    else if (mustMatchBeginning) {
+                        // any mismatch means, we do not match from the beginning
+                        return false;
                     }
                     else {