Added logic to allow "blank" inputs.

lib/python/SearchIndex/Index.py

@@ -10,8 +10,8 @@
 __doc__='''Simple column indexes
 
 
-$Id: Index.py,v 1.4 1997/09/10 21:46:18 jim Exp $'''
-__version__='$Revision: 1.4 $'[11:-2]
+$Id: Index.py,v 1.5 1997/09/12 14:18:04 jim Exp $'''
+__version__='$Revision: 1.5 $'[11:-2]
 
 from BTree import BTree
 from intSet import intSet
@@ -124,23 +124,31 @@ class Index:
 	try: keys=request[id]
 	except: return None
 
-	if type(keys) is not ListType: keys=[keys]
+	if type(keys) is ListType: keys=[keys]
 	index=self._index
 	r=None
+	anyTrue=0
 	for key in keys:
+	    if key: anyTrue=1
 	    try:
 		set=index[key]
 		if r is None: r=set
 		else: r = r.union(set)
 	    except KeyError: pass
 
-	if r is None: r=intSet()
+	if r is None:
+	    if anyTrue: r=intSet()
+	    else: return None
+
 	return r, (id,)
 	
 
 ############################################################################## 
 #
 # $Log: Index.py,v $
+# Revision 1.5  1997/09/12 14:18:04  jim
+# Added logic to allow "blank" inputs.
+#
 # Revision 1.4  1997/09/10 21:46:18  jim
 # Fixed bug that caused return of None when there were no matches.
 #