Changeset 2863 in josm

Timestamp:

2010-01-15T21:58:46+01:00 (14 years ago)

Author:

jttt

Message:

Fixed #4377 routes plugin search for user names defect, added boolean search operator

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/PushbackTokenizer.java (modified) (4 diffs)
• actions/search/SearchAction.java (modified) (2 diffs)
• actions/search/SearchCompiler.java (modified) (7 diffs)
• data/osm/User.java (modified) (3 diffs)

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.actions.search;
+
+import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.IOException;
@@ -19 +22 @@
     }
 
-    public enum Token {NOT, OR, LEFT_PARENT, RIGHT_PARENT, COLON, EQUALS, KEY, EOF}
+    public enum Token {
+        NOT(marktr("<not>")), OR(marktr("<or>")), LEFT_PARENT(marktr("<left parent>")),
+        RIGHT_PARENT(marktr("<right parent>")), COLON(marktr("<colon>")), EQUALS(marktr("<equals>")),
+        KEY(marktr("<key>")), QUESTION_MARK(marktr("<question mark>")), EOF(marktr("<end-of-file>"));
+
+        private Token(String name) {
+            this.name = name;
+        }
+
+        private final String name;
+
+        @Override
+        public String toString() {
+            return tr(name);
+        }
+    }
+
 
     private void getChar() {
@@ -69 +88 @@
             getChar();
             return Token.OR;
+        case '?':
+            getChar();
+            return Token.QUESTION_MARK;
         case '"':
         {
@@ -90 +112 @@
         {
             StringBuilder s = new StringBuilder();
-            while (!(c == -1 || Character.isWhitespace(c) || c == '"'|| c == ':' || c == '(' || c == ')' || c == '|' || c == '=')) {
+            while (!(c == -1 || Character.isWhitespace(c) || c == '"'|| c == ':' || c == '(' || c == ')' || c == '|' || c == '=' || c == '?')) {
                 s.append((char)c);
                 getChar();

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

@@ -122 +122 @@
                     + "<li>"+tr("<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>") + "</li>"
                     + "<li>"+tr("<b>-name:Bak</b> - not ''Bak'' in the name.")+"</li>"
+                    + "<li>"+tr("<b>oneway?</b> - oneway=yes, true, 1 or on")+"</li>"
                     + "<li>"+tr("<b>foot:</b> - key=foot set to any value.")+"</li>"
                     + "<li>"+tr("<u>Special targets:</u>")+"</li>"
@@ -321 +322 @@
         public String toString() {
             String cs = caseSensitive ?
-                    /*case sensitive*/  trc("search", "CS") :                                
+                    /*case sensitive*/  trc("search", "CS") :
                         /*case insensitive*/  trc("search", "CI");
                     /*regex search*/
-            String rx = regexSearch ? (", " + trc("search", "RX")) : ""; 
-            return "\"" + text + "\" (" + cs + rx + ", " + mode + ")";
+                    String rx = regexSearch ? (", " + trc("search", "RX")) : "";
+                    return "\"" + text + "\" (" + cs + rx + ", " + mode + ")";
         }
 

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

@@ -7 +7 @@
 import java.io.PushbackReader;
 import java.io.StringReader;
-import java.util.List;
 import java.util.Map.Entry;
 import java.util.regex.Matcher;
@@ -17 +16 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.DateUtils;
@@ -36 +35 @@
  ( expression )
  -fact
+ term?
  term=term
  term:term
@@ -80 +80 @@
         }
         @Override public String toString() {return "!"+match;}
+    }
+
+    private static class BooleanMatch extends Match {
+        private final String key;
+        private final boolean defaultValue;
+
+        public BooleanMatch(String key, boolean defaultValue) {
+            this.key = key;
+            this.defaultValue = defaultValue;
+        }
+        @Override
+        public boolean match(OsmPrimitive osm) {
+            Boolean ret = OsmUtils.getOsmBoolean(osm.get(key));
+            if (ret == null)
+                return defaultValue;
+            else
+                return ret;
+        }
     }
 
@@ -430 +448 @@
 
     private static class UserMatch extends Match {
-        private User user;
+        private String user;
         public UserMatch(String user) {
             if (user.equals("anonymous")) {
                 this.user = null;
             } else {
-                List<User> users = User.getByName(user);
-                if (!users.isEmpty()) {
-                    // selecting an arbitrary user
-                    this.user = users.get(0);
-                } else {
-                    this.user = User.createLocalUser(user);
-                }
-            }
-        }
-
-        @Override public boolean match(OsmPrimitive osm) {
-            if (osm.getUser() == null && user == null) return true;
-            if (osm.getUser() == null) return false;
-            return osm.getUser().equals(user);
+                this.user = user;
+            }
+        }
+
+        @Override public boolean match(OsmPrimitive osm) {
+            if (osm.getUser() == null)
+                return user == null;
+            else
+                return osm.getUser().hasName(user);
         }
 
         @Override public String toString() {
-            return "user=" + user == null ? "" : user.getName();
+            return "user=" + user == null ? "" : user;
         }
     }
@@ -641 +654 @@
             Match expression = parseExpression();
             if (!tokenizer.readIfEqual(Token.RIGHT_PARENT))
-                throw new ParseError(tr("Missing right parenthesis"));
+                throw new ParseError(tr("Unexpected token. Expected {0}, found {1}", Token.RIGHT_PARENT, tokenizer.nextToken()));
             return expression;
         } else if (tokenizer.readIfEqual(Token.NOT))
@@ -651 +664 @@
             else if (tokenizer.readIfEqual(Token.COLON))
                 return parseKV(key, tokenizer.readText());
+            else if (tokenizer.readIfEqual(Token.QUESTION_MARK))
+                return new BooleanMatch(key, false);
             else if ("modified".equals(key))
                 return new Modified();

trunk/src/org/openstreetmap/josm/data/osm/User.java

@@ -118 +118 @@
     }
 
-    /*
+    /**
      * Returns the list of user names
      *
@@ -127 +127 @@
     }
 
-    /*
+    /**
      * Adds a user name to the list if it is not there, yet.
      *
@@ -136 +136 @@
     }
 
-    /*
+    /**
      * Returns true if the name is in the names list
      *