# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1429101175 -7200
# Node ID 7c6f10ffdda0fd0746d07385ec2c8cbcc4ced5ea
# Parent  959d098e49d9912b97d479318c3bd622e8e005f9
Added "or_" and "and_" query operators

diff -r 959d098e49d9 -r 7c6f10ffdda0 src/pyams_catalog/query.py
--- a/src/pyams_catalog/query.py	Wed Apr 15 14:32:28 2015 +0200
+++ b/src/pyams_catalog/query.py	Wed Apr 15 14:32:55 2015 +0200
@@ -38,3 +38,21 @@
             query = query[1]
         for oid in query:
             yield self.intids.queryObject(oid)
+
+
+def or_(source, added):
+    """Combine two queries with 'or'"""
+    if source is None:
+        source = added
+    else:
+        source |= added
+    return source
+
+
+def and_(source, added):
+    """Combine two queries with 'and'"""
+    if source is None:
+        source = added
+    else:
+        source &= added
+    return source