[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Container/Find - FindAdapter.py:1.1.2.2

Martijn Faassen m.faassen@vet.uu.nl
Tue, 9 Apr 2002 12:39:43 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Container/Find
In directory cvs.zope.org:/tmp/cvs-serv13256/App/OFS/Container/Find

Modified Files:
      Tag: Zope-3x-branch
	FindAdapter.py 
Log Message:
Use new 'url' view to get absolute_url so you can actually click on links
now. 


=== Zope3/lib/python/Zope/App/OFS/Container/Find/FindAdapter.py 1.1.2.1 => 1.1.2.2 ===
         container = self._context
         for id, object in container.objectItems():
+            object = Wrapper(object, container, name=id)
             _find_helper(id, object, container,
                          id_filters, object_filters,
                          result)
@@ -61,8 +62,6 @@
             if not object_filter.matches(object):
                 break
         else:
-            # XXX wrap object
-            object = Wrapper(object, container, name=id)
             # if we didn't break out of the loop, all filters matched
             result.append(object)
 
@@ -71,6 +70,7 @@
 
     container = object
     for id, object in container.objectItems():
+        object = Wrapper(object, container, name=id)
         _find_helper(id, object, container, id_filters, object_filters, result)
 
 class SimpleIdFindFilter(object):