Changeset 2777 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-01-08T17:59:54+01:00 (15 years ago)

Author:

mjulius

Message:

fixes #2473 - Search does not work when searching for value containing literal quote
Quotes within quoted strings can now be escaped with backslash.

Location:

trunk/src/org/openstreetmap/josm/actions/search

Files:

• PushbackTokenizer.java (modified) (1 diff)
• SearchAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java

@@ -73 +73 @@
             getChar();
             StringBuilder s = new StringBuilder();
-            while (c != -1 && c != '"') {
-                s.append((char)c);
+            boolean escape = false;
+            while (c != -1 && (c != '"' || escape)) {
+                if (c == '\\' && !escape) {
+                    escape = true;
+                } else {
+                    s.append((char)c);
+                    escape = false;
+                }
                 getChar();
             }

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -138 +138 @@
                     + "<li>"+tr("<b>parent <i>expr</i></b> - all parents of objects matching the expression")+"</li>"
                     + "<li>"+tr("Use <b>|</b> or <b>OR</b> to combine with logical or")+"</li>"
-                    + "<li>"+tr("Use <b>\"</b> to quote operators (e.g. if key contains :)")+"</li>"
+                    + "<li>"+tr("Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)") + "<br/>"
+                    + tr("Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>).")+"</li>"
                     + "<li>"+tr("Use <b>(</b> and <b>)</b> to group expressions")+"</li>"
                     + "</ul></html>");