[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Container/Find - FindAdapter.py:1.2 IFind.py:1.2 __init__.py:1.2 find.zcml:1.2

[Jim Fulton]

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

Added Files:
	FindAdapter.py IFind.py __init__.py find.zcml 
Log Message:
Merged Zope-3x-branch into newly forked Zope3 CVS Tree.


=== Zope3/lib/python/Zope/App/OFS/Container/Find/FindAdapter.py 1.1 => 1.2 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+# 
+##############################################################################
+"""
+
+$Id$
+
+"""
+
+from Zope.App.OFS.Container.Find.IFind import IFind, IIdFindFilter
+from Zope.App.OFS.Container.IContainer import IReadContainer
+# XXX need to do this manually to wrap objects
+from Zope.Proxy.ContextWrapper import ContextWrapper
+
+class FindAdapter(object):
+
+    __implements__ =  IFind
+
+    __used_for__ = IReadContainer
+    
+    def __init__(self, context):
+        self._context = context
+        
+    ############################################################
+    # Implementation methods for interface
+    # Zope.App.OFS.Container.Find.IFind.IFind
+
+    def find(self, id_filters=None, object_filters=None):
+        'See Zope.App.OFS.Container.Find.IFind.IFind'
+        id_filters = id_filters or []
+        object_filters = object_filters or []
+        result = []
+        container = self._context
+        for id, object in container.items():
+            object = ContextWrapper(object, container, name=id)
+            _find_helper(id, object, container,
+                         id_filters, object_filters,
+                         result)
+        return result
+    
+    #
+    ############################################################
+
+def _find_helper(id, object, container, id_filters, object_filters, result):
+    for id_filter in id_filters:
+        if not id_filter.matches(id):
+            break
+    else:
+        # if we didn't break out of the loop, all name filters matched
+        # now check all object filters
+        for object_filter in object_filters:
+            if not object_filter.matches(object):
+                break
+        else:
+            # if we didn't break out of the loop, all filters matched
+            result.append(object)
+
+    if not IReadContainer.isImplementedBy(object):
+        return
+
+    container = object
+    for id, object in container.items():
+        object = ContextWrapper(object, container, name=id)
+        _find_helper(id, object, container, id_filters, object_filters, result)
+
+class SimpleIdFindFilter(object):
+
+    __implements__ =  IIdFindFilter
+
+    def __init__(self, ids):
+        self._ids = ids
+        
+    ############################################################
+    # Implementation methods for interface
+    # Zope.App.OFS.Container.Find.IFind.INameFindFilter
+
+    def matches(self, id):
+        'See Zope.App.OFS.Container.Find.IFind.INameFindFilter'
+        return id in self._ids
+
+    #
+    ############################################################
+


=== Zope3/lib/python/Zope/App/OFS/Container/Find/IFind.py 1.1 => 1.2 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+# 
+##############################################################################
+"""
+
+$Id$
+"""
+
+from Interface import Interface
+
+class IFind(Interface):
+    """
+    Find support for containers.
+    """
+    
+    def find(id_filters=None, object_filters=None):
+        """Find object that matches all filters in all sub objects,
+        not including this container itself.
+        """
+
+class IObjectFindFilter(Interface):
+
+    def matches(object):
+        """Returns true if the object matches the filter criteria.
+        """
+        
+class IIdFindFilter(Interface):
+
+    def matches(id):
+        """Returns true if the id matches the filter criteria.
+        """
+
+        


=== Zope3/lib/python/Zope/App/OFS/Container/Find/__init__.py 1.1 => 1.2 ===


=== Zope3/lib/python/Zope/App/OFS/Container/Find/find.zcml 1.1 => 1.2 ===
+   xmlns='http://namespaces.zope.org/zope'
+   xmlns:security='http://namespaces.zope.org/security' 
+>
+ 
+  <adapter 
+     provides=".IFind."
+     for="Zope.App.OFS.Container.IContainer.IReadContainer"
+     permission="Zope.ManageContent" 
+     factory=".FindAdapter." />
+ 
+  <include package=".Views" file="views.zcml" />
+
+</zopeConfigure>