[Zope3-checkins] SVN: Zope3/branches/jim-indexing/src/zope/app/index/ See previous message.

[Jim Fulton]

Log message for revision 24958:
See previous message.



-=-
Modified: Zope3/branches/jim-indexing/src/zope/app/index/__init__.py
===================================================================
--- Zope3/branches/jim-indexing/src/zope/app/index/__init__.py	2004-05-25 12:27:16 UTC (rev 24957)
+++ Zope3/branches/jim-indexing/src/zope/app/index/__init__.py	2004-05-25 12:28:11 UTC (rev 24958)
@@ -1,77 +1 @@
-##############################################################################
 #
-# Copyright (c) 2003 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.interface import implements
-from zope.app.index.interfaces import IInterfaceIndexer
-from zope.app.event.interfaces import ISubscriber
-
-from zope.app.hub.interfaces import \
-     IObjectRegisteredHubEvent, \
-     IObjectUnregisteredHubEvent, \
-     IObjectModifiedHubEvent
-
-
-class InterfaceIndexingSubscriber(object):
-    """Mixin for indexing a particular field name, after first adapting the
-       object to be indexed to an interface.
-    """
-    implements(IInterfaceIndexer, ISubscriber)
-    default_field_name = None
-    default_interface = None
-
-    def __init__(self, field_name=None, interface=None):
-        super(InterfaceIndexingSubscriber, self).__init__()
-        if field_name is None and self.default_field_name is None:
-            raise ValueError, "Must pass a field_name"
-        if field_name is None:
-            self._field_name = self.default_field_name
-        else:
-            self._field_name = field_name
-        if interface is None:
-            self._interface = self.default_interface
-        else:
-            self._interface = interface
-
-    field_name = property(lambda self: self._field_name)
-    interface = property(lambda self: self._interface)
-
-    def _getValue(self, object):
-        if self._interface is not None:
-            object = self._interface(object, None)
-            if object is None: return None
-
-        value = getattr(object, self._field_name, None)
-        if value is None: return None
-
-        if callable(value):
-            try: value = value()
-            except: return None
-
-        return value
-
-    def notify(self, event):
-        """An event occurred.  Index or unindex the object in response."""
-        if (IObjectRegisteredHubEvent.providedBy(event) or
-            IObjectModifiedHubEvent.providedBy(event)):
-            value = self._getValue(event.object)
-            if value is not None:
-                self.index_doc(event.hubid, value)
-        elif IObjectUnregisteredHubEvent.providedBy(event):
-            try:
-                self.unindex_doc(event.hubid)
-            except KeyError:
-                pass
-

Modified: Zope3/branches/jim-indexing/src/zope/app/index/keyword/index.py
===================================================================
--- Zope3/branches/jim-indexing/src/zope/app/index/keyword/index.py	2004-05-25 12:27:16 UTC (rev 24957)
+++ Zope3/branches/jim-indexing/src/zope/app/index/keyword/index.py	2004-05-25 12:28:11 UTC (rev 24958)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""This is a keyword index which can be subscribed to an event service.
+"""This is a keyword index
 
 $Id$
 """
@@ -20,7 +20,7 @@
 
 from zope.app.index.interfaces.keyword import IUIKeywordCatalogIndex
 from zope.app.catalog.interfaces.index import ICatalogIndex
-from zope.app.index import InterfaceIndexingSubscriber
+from zope.app.index.ifaceindex import InterfaceIndexingSubscriber
 
 class KeywordCatalogIndex(InterfaceIndexingSubscriber, KeywordIndex):
     implements(ICatalogIndex, IUIKeywordCatalogIndex)