# HG changeset patch # User casties # Date 1321535212 -3600 # Node ID 9fb0d4f24486ed6db725b9e3728682697e067005 # Parent 9cea47dc692636dfbba1a4388d8c25963d4192ab comments with a bit of documentation diff -r 9cea47dc6926 -r 9fb0d4f24486 ZDBInterfaceFolder.py --- a/ZDBInterfaceFolder.py Thu Nov 10 19:59:59 2011 +0100 +++ b/ZDBInterfaceFolder.py Thu Nov 17 14:06:52 2011 +0100 @@ -88,23 +88,26 @@ wheres.append(param + " ILIKE %s") args.append("%" + val + "%") elif op == "all": + # p="a b c" -> WHERE (p ILIKE '%a%' AND p ILIKE '%b%' AND p ILIKE '%c%') words = [] for word in val.split(" "): words.append(param + " ILIKE %s") args.append("%" + word + "%") wheres.append("(" + " AND ".join(words) + ")") elif op == "one": + # p="a b c" -> WHERE (p ILIKE '%a%' OR p ILIKE '%b%' OR p ILIKE '%c%') words = [] for word in val.split(" "): words.append(param + " ILIKE %s") args.append("%" + word + "%") wheres.append("(" + " OR ".join(words) + ")") elif op == "in": + # p="a b c" -> WHERE p IN ('a', 'b', 'c') words = [] for word in val.split(" "): words.append("%s") args.append(word) - wheres.append(param + " in (" + ", ".join(words) + ")") + wheres.append(param + " IN (" + ", ".join(words) + ")") else: logging.error("getSQLquery: unknown op=%s!"%op)