Changeset 17746 in josm

Timestamp:

2021-04-11T13:09:44+02:00 (3 years ago)

Author:

simon04

Message:

fix #16171 - Case sensitive regexp key=value searches aren't case sensitive

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -898 +898 @@
          * Constructs a new {@code ExactKeyValue}.
          * @param regexp regular expression
+         * @param caseSensitive {@code true} to perform a case-sensitive search
          * @param key key
          * @param value value
          * @throws SearchParseError if a parse error occurs
          */
-        public ExactKeyValue(boolean regexp, String key, String value) throws SearchParseError {
+        public ExactKeyValue(boolean regexp, boolean caseSensitive, String key, String value) throws SearchParseError {
             if ("".equals(key))
                 throw new SearchParseError(tr("Key cannot be empty when tag operator is used. Sample use: key=value"));
@@ -938 +939 @@
 
             if (regexp && !key.isEmpty() && !"*".equals(key)) {
-                keyPattern = compilePattern(key, regexFlags(false));
+                keyPattern = compilePattern(key, regexFlags(caseSensitive));
             } else {
                 keyPattern = null;
             }
             if (regexp && !this.value.isEmpty() && !"*".equals(this.value)) {
-                valuePattern = compilePattern(this.value, regexFlags(false));
+                valuePattern = compilePattern(this.value, regexFlags(caseSensitive));
             } else {
                 valuePattern = null;
@@ -2102 +2103 @@
             String key = tokenizer.getText();
             if (tokenizer.readIfEqual(Token.EQUALS)) {
-                return new ExactKeyValue(regexSearch, key, tokenizer.readTextOrNumber());
+                return new ExactKeyValue(regexSearch, caseSensitive, key, tokenizer.readTextOrNumber());
             } else if (tokenizer.readIfEqual(Token.TILDE)) {
-                return new ExactKeyValue(true, key, tokenizer.readTextOrNumber());
+                return new ExactKeyValue(true, caseSensitive, key, tokenizer.readTextOrNumber());
             } else if (tokenizer.readIfEqual(Token.LESS_THAN)) {
                 return new ValueComparison(key, tokenizer.readTextOrNumber(), -1);

trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java

@@ -147 +147 @@
 
     /**
+     * Search by case-sensitive regular expression.
+     * @throws SearchParseError if an error has been encountered while compiling
+     */
+    @Test
+    void testRegexpCaseSensitive() throws Exception {
+        SearchSetting searchSetting = new SearchSetting();
+        searchSetting.regexSearch = true;
+        searchSetting.text = "foo=\"^bar$\"";
+        assertTrue(SearchCompiler.compile(searchSetting).match(OsmUtils.createPrimitive("node foo=bar")));
+        assertTrue(SearchCompiler.compile(searchSetting).match(OsmUtils.createPrimitive("node foo=BAR")));
+        searchSetting.caseSensitive = true;
+        assertTrue(SearchCompiler.compile(searchSetting).match(OsmUtils.createPrimitive("node foo=bar")));
+        assertFalse(SearchCompiler.compile(searchSetting).match(OsmUtils.createPrimitive("node foo=BAR")));
+    }
+
+    /**
      * Search by comparison.
      * @throws SearchParseError if an error has been encountered while compiling