Index: roundup/cgi/templating.py
===================================================================
--- roundup/cgi/templating.py	(Revision 4543)
+++ roundup/cgi/templating.py	(Arbeitskopie)
@@ -27,6 +27,8 @@
 from roundup import i18n
 from roundup.i18n import _
 
+from KeywordsExpr import render_keywords_expression_editor
+
 try:
     import cPickle as pickle
 except ImportError:
@@ -2848,6 +2850,9 @@
             raise AttributeError, name
         return self.client.instance.templating_utils[name]
 
+    def keywords_expressions(self, request):
+        return render_keywords_expression_editor(request)
+
     def html_calendar(self, request):
         """Generate a HTML calendar.
 
Index: roundup/cgi/KeywordsExpr.py
===================================================================
--- roundup/cgi/KeywordsExpr.py	(Revision 0)
+++ roundup/cgi/KeywordsExpr.py	(Revision 0)
@@ -0,0 +1,273 @@
+# This module is free software, you may redistribute it
+# and/or modify under the same terms as Python.
+
+WINDOW_CONTENT = '''\
+<h3>Keyword Expression Editor:</h3>
+<hr/>
+<div id="content"></div>
+<script type="text/javascript">
+<!--
+
+var NOT_OP = "-2";
+var AND_OP = "-3";
+var OR_OP  = "-4";
+
+var original = "%(original)s";
+var current = original;
+var undo = [];
+
+var KEYWORDS = [
+    %(keywords)s
+];
+
+function find_keyword(x) {
+    for (var i = 0; i < KEYWORDS.length; ++i) {
+        if (KEYWORDS[i][0] == x) {
+            return KEYWORDS[i][1];
+        }
+    }
+    return "unknown";
+}
+
+function Equals(x) {
+    this.x = x;
+    this.brackets = false;
+
+    this.infix = function() {
+        return find_keyword(this.x);
+    }
+
+    this.postfix = function() {
+        return this.x;
+    }
+}
+
+function Not(x) {
+    this.x = x;
+    this.brackets = false;
+
+    this.infix = function() {
+        return this.x.brackets 
+            ? "NOT(" + this.x.infix() + ")"
+            : "NOT " + this.x.infix();
+    }
+
+    this.postfix = function() {
+        return this.x.postfix() + "," + NOT_OP;
+    }
+}
+
+function And(x, y) {
+    this.x = x;
+    this.y = y;
+    this.brackets = true;
+
+    this.infix = function() {
+        var a = this.x.brackets ? "(" + this.x.infix() + ")" : this.x.infix();
+        var b = this.y.brackets ? "(" + this.y.infix() + ")" : this.y.infix();
+        return a + " AND " + b;
+    }
+    this.postfix = function() {
+        return this.x.postfix() + "," + this.y.postfix() + "," + AND_OP;
+    }
+}
+
+function Or(x, y) {
+    this.x = x;
+    this.y = y;
+    this.brackets = true;
+
+    this.infix = function() {
+        var a = this.x.brackets ? "(" + this.x.infix() + ")" : this.x.infix();
+        var b = this.y.brackets ? "(" + this.y.infix() + ")" : this.y.infix();
+        return a + " OR " + b;
+    }
+
+    this.postfix = function() {
+        return this.x.postfix() + "," + this.y.postfix() + "," + OR_OP;
+    }
+}
+
+function trim(s) {
+    return s.replace (/^\s+/, '').replace(/\s+$/, '');
+}
+
+function parse(s) {
+    var operators = s.split(",");
+    var stack = [];
+    for (var i = 0; i < operators.length; ++i) {
+        var operator = trim(operators[i]);
+        if (operator == "") continue;
+        if (operator == NOT_OP) {
+            stack.push(new Not(stack.pop()));
+        }
+        else if (operator == AND_OP) {
+            var a = stack.pop();
+            var b = stack.pop();
+            stack.push(new And(b, a));
+        }
+        else if (operator == OR_OP) {
+            var a = stack.pop();
+            var b = stack.pop();
+            stack.push(new Or(b, a));
+        }
+        else {
+            stack.push(new Equals(operator));
+        }
+    }
+    return stack.length > 0 ? stack.pop() : null;
+}
+
+function render_select(handler) {
+    var out = '<select name="keyword" id="keyword"';
+    if (handler != null) {
+        out += ' onchange="' + handler + '"';
+    }
+    out += '>';
+    out += '<option value="-1"><\/option>';
+    for (var i = 0; i < KEYWORDS.length; ++i) {
+        out += '<option value="' + KEYWORDS[i][0] + 
+               '">' + KEYWORDS[i][1] + "<\/option>";
+    }
+    out += '<\/select>';
+    return out;
+}
+
+function first_select() {
+    var value = document.getElementById("keyword").value;
+    current = value;
+    set_content();
+}
+
+function not_clicked() {
+    var expr = parse(current);
+    if (expr == null) return;
+    undo.push(current);
+    current = expr instanceof Not
+        ? expr.x.postfix()
+        : new Not(expr).postfix();
+    set_content();
+}
+
+function not_b_wrap(expr) {
+    var value = document.getElementById("not_b").checked;
+    return value ? new Not(expr) : expr;
+}
+
+function and_clicked() {
+    var expr = parse(current);
+    if (expr == null) return;
+    var value = document.getElementById("keyword").value;
+    if (value == "-1") return;
+    undo.push(current);
+    current = new And(expr, not_b_wrap(new Equals(value))).postfix();
+    set_content();
+}
+
+function or_clicked() {
+    var expr = parse(current);
+    if (expr == null) return;
+    var value = document.getElementById("keyword").value;
+    if (value == "-1") return;
+    undo.push(current);
+    current = new Or(expr, not_b_wrap(new Equals(value))).postfix();
+    set_content();
+}
+
+function undo_clicked() {
+    current = undo.length > 0 
+        ? undo.pop()
+        : original;
+    set_content();
+}
+
+function enable_and_or() {
+    var value = document.getElementById("keyword").value;
+    value = value == "-1";
+    document.getElementById("and").disabled = value;
+    document.getElementById("or").disabled = value;
+    document.getElementById("not_b").disabled = value;
+}
+
+function create() {
+    var expr = parse(current);
+    var out = "";
+    if (expr == null) {
+        out += "Keyword: ";
+        out += render_select("first_select();");
+    }
+    else {
+        out += '<table><tr>'
+        out += '<td><input type="button" name="not" onclick="not_clicked();" value="NOT"\/><\/td>';
+        out += "<td><tt><strong>" + expr.infix() + "<\/strong><\/tt><\/td>";
+        out += '<td><table>';
+        out += '<tr><td><input type="button" id="and" name="and" onclick="and_clicked();"'
+            +  ' value="AND" disabled="disabled"\/><\/td><\/tr>';
+        out += '<tr><td><input type="button" id="or" name="or" onclick="or_clicked();"'
+            +  ' value="OR" disabled="disabled"\/><\/td><\/tr>';
+        out += '<\/table><\/td>';
+        out += '<td><label for="not_b">NOT<\/label><br/>'
+            +  '<input type="checkbox" name="not_b" id="not_b" disabled="disabled"\/><\/td>';
+        out += '<td>' + render_select("enable_and_or();") + '<\/td>';
+        out += '<\/tr><\/table>'
+    }
+    out += '<hr\/>';
+    if (undo.length > 0 || (undo.length == 0 && current != original)) {
+        out += '<input type="button" onclick="undo_clicked();" value="Undo"\/>';
+    }
+    out += '<input type="button" onclick="modify_main();" value="Apply"\/>'
+        +  '<input type="button" onclick="window.close();" value="Close Window"\/>';
+    return out;
+}
+
+function main_content() {
+    var out = '';
+    out += '<input type="hidden" name="%(prop)s" value="' + current + '"\/>';
+    out += parse(current).infix();
+    return out;
+}
+
+function modify_main() {
+    main = window.opener.document.getElementById("keywords_%(prop)s");
+    main.innerHTML = main_content();
+}
+
+function set_content() {
+    document.getElementById("content").innerHTML = create();
+}
+
+set_content();
+//-->
+</script>
+'''
+
+def list_nodes(request):
+    prop = request.form.getfirst("property")
+    cls = request.client.db.getclass(prop)
+    items = []
+    for nodeid in cls.getnodeids():
+        l = cls.getnode(nodeid).items()
+        l = dict([x for x in l if len(x) == 2])
+        try:
+            items.append((l['id'], l['name']))
+        except KeyError:
+            pass
+    items.sort(key=lambda x: int(x[0]))
+    return items
+
+def items_to_keywords(items):
+    return ',\n    '.join(['["%s", "%s"]' % x for x in items])
+   
+
+def render_keywords_expression_editor(request):
+    prop = request.form.getfirst("property")
+
+    window_content = WINDOW_CONTENT % {
+        'prop'    : prop,
+        'keywords': items_to_keywords(list_nodes(request)),
+        'original': ''
+    }
+
+    return window_content
+
+# vim: set et sts=4 sw=4 :
Index: roundup/backends/back_anydbm.py
===================================================================
--- roundup/backends/back_anydbm.py	(Revision 4543)
+++ roundup/backends/back_anydbm.py	(Arbeitskopie)
@@ -49,6 +49,60 @@
 def db_nuke(config):
     shutil.rmtree(config.DATABASE)
 
+class Equals:
+    def __init__(self, x):
+        self.x = x
+
+    def evaluate(self, v):
+        return self.x in v
+
+class Not:
+    def __init__(self, x):
+        self.x = x
+
+    def evaluate(self, v):
+        return not self.x.evaluate(v)
+
+class Or:
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+
+    def evaluate(self, v):
+        return self.x.evaluate(v) or self.y.evaluate(v)
+
+class And:
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+
+    def evaluate(self, v):
+        return self.x.evaluate(v) and self.y.evaluate(v)
+        
+
+class Expression:
+
+    def __init__(self, v):
+        try:
+            opcodes = [int(x) for x in v]
+            if min(opcodes) >= -1: raise ValueError()
+
+            stack = []
+            for opcode in opcodes:
+                if opcode == -2: # not
+                    stack.append(Not(stack.pop()))
+                elif opcode == -3: # and
+                    stack.append(And(stack.pop(), stack.pop()))
+                elif opcode == -4: # or
+                    stack.append(Or(stack.pop(), stack.pop()))
+                else: # =
+                    stack.append(Equals(opcode))
+
+            compiled = stack.pop()
+            self.evaluate = lambda x: compiled.evaluate([int(y) for y in x])
+        except:
+            self.evaluate = lambda x: bool(set(x) & set(v))
+
 #
 # Now the database
 #
@@ -1700,12 +1754,10 @@
                         if not v:
                             match = not nv
                         else:
-                            # othewise, make sure this node has each of the
+                            # otherwise, make sure this node has each of the
                             # required values
-                            for want in v:
-                                if want in nv:
-                                    match = 1
-                                    break
+                            expr = Expression(v)
+                            if expr.evaluate(nv): match = 1
                     elif t == STRING:
                         if nv is None:
                             nv = ''
Index: share/roundup/templates/devel/html/page.html
===================================================================
--- share/roundup/templates/devel/html/page.html	(Revision 4543)
+++ share/roundup/templates/devel/html/page.html	(Arbeitskopie)
@@ -307,6 +307,20 @@
   </select>
 </td>
 
+<td metal:define-macro="search_select_keywords">
+  <select tal:attributes="name name; id name"
+          tal:define="value python:request.form.getvalue(name)">
+    <option value="" i18n:translate="">don't care</option>
+    <metal:slot define-slot="extra_options" />
+    <option value="" i18n:translate="" disabled="disabled">------------</option>
+    <option tal:repeat="s python:db[db_klass].list()"
+            tal:attributes="value s/id; selected python:value == s.id"
+            tal:content="python:s[db_content]"></option>
+  </select>
+  <a class="classhelp"
+	 tal:attributes="href python:'''javascript:help_window('task?@template=&property=%s&form=itemSynopsis', 300, 200)'''%name">(edit)</a>
+</td>
+
 <!-- like search_select, but translates the further values.
 Could extend it (METAL 1.1 attribute "extend-macro")
 -->
Index: share/roundup/templates/classic/html/_generic.keywords_expr.html
===================================================================
--- share/roundup/templates/classic/html/_generic.keywords_expr.html	(Revision 0)
+++ share/roundup/templates/classic/html/_generic.keywords_expr.html	(Revision 0)
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+ <head>
+  <link rel="stylesheet" type="text/css" href="@@file/style.css" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8;" />
+  <title tal:content="string:Roundup Keywords Expression Editor"></title>
+ </head>
+ <body class="body"
+       tal:content="structure python:utils.keywords_expressions(request)">
+ </body>
+</html>
Index: share/roundup/templates/classic/html/page.html
===================================================================
--- share/roundup/templates/classic/html/page.html	(Revision 4543)
+++ share/roundup/templates/classic/html/page.html	(Arbeitskopie)
@@ -247,6 +247,22 @@
   </select>
 </td>
 
+<td metal:define-macro="search_select_keywords">
+  <div tal:attributes="id python:'''keywords_%s'''%name">
+    <select tal:attributes="name name; id name"
+            tal:define="value python:request.form.getvalue(name)">
+      <option value="" i18n:translate="">don't care</option>
+      <metal:slot define-slot="extra_options" />
+      <option value="" i18n:translate="" disabled="disabled">------------</option>
+      <option tal:repeat="s python:db[db_klass].list()"
+              tal:attributes="value s/id; selected python:value == s.id"
+              tal:content="python:s[db_content]"></option>
+    </select>
+    <a class="classhelp"
+	   tal:attributes="href python:'''javascript:help_window('issue?@template=keywords_expr&property=%s&form=itemSynopsis', 350, 200)'''%name">(expr)</a>
+  </div>
+</td>
+
 <!-- like search_select, but translates the further values.
 Could extend it (METAL 1.1 attribute "extend-macro")
 -->
Index: share/roundup/templates/classic/html/issue.search.html
===================================================================
--- share/roundup/templates/classic/html/issue.search.html	(Revision 4543)
+++ share/roundup/templates/classic/html/issue.search.html	(Arbeitskopie)
@@ -23,6 +23,7 @@
    sort_input templates/page/macros/sort_input;
    group_input templates/page/macros/group_input;
    search_select templates/page/macros/search_select;
+   search_select_keywords templates/page/macros/search_select_keywords;
    search_select_translated templates/page/macros/search_select_translated;
    search_multiselect templates/page/macros/search_multiselect;">
 
@@ -54,7 +55,7 @@
                 db_klass string:keyword;
                 db_content string:name;">
   <th i18n:translate="">Keyword:</th>
-  <td metal:use-macro="search_select">
+  <td metal:use-macro="search_select_keywords">
     <option metal:fill-slot="extra_options" value="-1" i18n:translate=""
             tal:attributes="selected python:value == '-1'">not selected</option>
   </td>