Commit fcc53230 authored by Shane Hathaway's avatar Shane Hathaway

Cosmetic change so I can get my lost log message in. :-)

In the change just before this one, I
corrected the optimization of not applying unused indexes (although this
optimization does not seem right since index.id is not necessarily
equivalent to the key to look for in the request).  DateTime objects
don't have and don't need a __len__ attribute.
parent 844ea3af
...@@ -531,7 +531,7 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base): ...@@ -531,7 +531,7 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
rs = None # resultset rs = None # resultset
data = self.data data = self.data
if used is None: used={} if used is None: used={}
for i in self.indexes.keys(): for i in self.indexes.keys():
...@@ -550,8 +550,6 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base): ...@@ -550,8 +550,6 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
r, u = r r, u = r
for name in u: used[name]=1 for name in u: used[name]=1
w, rs = weightedIntersection(rs, r) w, rs = weightedIntersection(rs, r)
#assert rs==None or hasattr(rs, 'values') or hasattr(rs, 'keys') #assert rs==None or hasattr(rs, 'values') or hasattr(rs, 'keys')
if rs is None: if rs is None:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment