Commit c78ee0c4 authored by Andreas Jung's avatar Andreas Jung

waahhhh...re-added SimpleItem as base class as SimpleItem seems to

be needed for the ZMI
parent 6509c5cf
...@@ -19,11 +19,12 @@ from Globals import Persistent, DTMLFile ...@@ -19,11 +19,12 @@ from Globals import Persistent, DTMLFile
from Acquisition import Implicit from Acquisition import Implicit
from Products.PluginIndexes import PluggableIndex from Products.PluginIndexes import PluggableIndex
from Products.PluginIndexes.common.UnIndex import UnIndex from Products.PluginIndexes.common.UnIndex import UnIndex
_marker = [] _marker = []
class KeywordIndex(UnIndex,Persistent, Implicit): class KeywordIndex(UnIndex):
__implements__ = (PluggableIndex.PluggableIndexInterface,) __implements__ = (PluggableIndex.PluggableIndexInterface,)
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
############################################################################## ##############################################################################
__version__ = '$Id: PathIndex.py,v 1.21 2002/04/25 12:32:13 andreasjung Exp $' __version__ = '$Id: PathIndex.py,v 1.22 2002/04/25 12:44:02 andreasjung Exp $'
from Products.PluginIndexes import PluggableIndex from Products.PluginIndexes import PluggableIndex
from Products.PluginIndexes.common.util import parseIndexRequest from Products.PluginIndexes.common.util import parseIndexRequest
...@@ -23,12 +23,13 @@ from BTrees.IOBTree import IOBTree ...@@ -23,12 +23,13 @@ from BTrees.IOBTree import IOBTree
from BTrees.OOBTree import OOBTree,OOSet from BTrees.OOBTree import OOBTree,OOSet
from BTrees.OIBTree import OIBTree from BTrees.OIBTree import OIBTree
from BTrees.IIBTree import IISet,difference,intersection,union from BTrees.IIBTree import IISet,difference,intersection,union
from OFS.SimpleItem import SimpleItem
from types import StringType, ListType, TupleType from types import StringType, ListType, TupleType
import re,warnings import re,warnings
_marker = [] _marker = []
class PathIndex(Persistent, Implicit): class PathIndex(Persistent, Implicit, SimpleItem):
""" A path index stores all path components of the physical """ A path index stores all path components of the physical
path of an object: path of an object:
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
"""Text Index """Text Index
""" """
__version__ = '$Revision: 1.30 $'[11:-2] __version__ = '$Revision: 1.31 $'[11:-2]
import re import re
...@@ -26,6 +26,7 @@ from Products.PluginIndexes.common.ResultList import ResultList ...@@ -26,6 +26,7 @@ from Products.PluginIndexes.common.ResultList import ResultList
from Products.PluginIndexes import PluggableIndex from Products.PluginIndexes import PluggableIndex
from Products.PluginIndexes.common.util import parseIndexRequest from Products.PluginIndexes.common.util import parseIndexRequest
from OFS.SimpleItem import SimpleItem
from BTrees.IOBTree import IOBTree from BTrees.IOBTree import IOBTree
from BTrees.OIBTree import OIBTree from BTrees.OIBTree import OIBTree
from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
...@@ -51,7 +52,7 @@ operator_dict = {'andnot': AndNot, 'and': And, 'or': Or, ...@@ -51,7 +52,7 @@ operator_dict = {'andnot': AndNot, 'and': And, 'or': Or,
'...': Near, 'near': Near, '...': Near, 'near': Near,
AndNot: AndNot, And: And, Or: Or, Near: Near} AndNot: AndNot, And: And, Or: Or, Near: Near}
class TextIndex(Persistent, Implicit): class TextIndex(Persistent, Implicit, SimpleItem):
"""Full-text index. """Full-text index.
There is a ZCatalog UML model that sheds some light on what is There is a ZCatalog UML model that sheds some light on what is
......
...@@ -11,12 +11,13 @@ ...@@ -11,12 +11,13 @@
# #
############################################################################## ##############################################################################
__version__ = '$Id: TopicIndex.py,v 1.7 2002/04/25 12:32:14 andreasjung Exp $' __version__ = '$Id: TopicIndex.py,v 1.8 2002/04/25 12:44:02 andreasjung Exp $'
from Products.PluginIndexes import PluggableIndex from Products.PluginIndexes import PluggableIndex
from Products.PluginIndexes.common.util import parseIndexRequest from Products.PluginIndexes.common.util import parseIndexRequest
from Globals import Persistent, DTMLFile from Globals import Persistent, DTMLFile
from OFS.SimpleItem import SimpleItem
from Acquisition import Implicit from Acquisition import Implicit
from BTrees.OOBTree import OOBTree from BTrees.OOBTree import OOBTree
from BTrees.IIBTree import IISet,intersection,union from BTrees.IIBTree import IISet,intersection,union
...@@ -24,7 +25,7 @@ import FilteredSet ...@@ -24,7 +25,7 @@ import FilteredSet
_marker = [] _marker = []
class TopicIndex(Persistent, Implicit): class TopicIndex(Persistent, Implicit, SimpleItem):
""" A TopicIndex maintains a set of FilteredSet objects. """ A TopicIndex maintains a set of FilteredSet objects.
Every FilteredSet object consists of an expression and Every FilteredSet object consists of an expression and
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"""Simple column indices""" """Simple column indices"""
__version__='$Revision: 1.11 $'[11:-2] __version__='$Revision: 1.12 $'[11:-2]
from Globals import Persistent from Globals import Persistent
from Acquisition import Implicit from Acquisition import Implicit
...@@ -25,6 +25,7 @@ from types import StringType, ListType, IntType, TupleType ...@@ -25,6 +25,7 @@ from types import StringType, ListType, IntType, TupleType
from BTrees.OOBTree import OOBTree, OOSet from BTrees.OOBTree import OOBTree, OOSet
from BTrees.IOBTree import IOBTree from BTrees.IOBTree import IOBTree
from BTrees.IIBTree import IITreeSet, IISet, union, intersection from BTrees.IIBTree import IITreeSet, IISet, union, intersection
from OFS.SimpleItem import SimpleItem
import BTrees.Length import BTrees.Length
from Products.PluginIndexes.common.util import parseIndexRequest from Products.PluginIndexes.common.util import parseIndexRequest
...@@ -32,7 +33,7 @@ import sys ...@@ -32,7 +33,7 @@ import sys
_marker = [] _marker = []
class UnIndex(Persistent, Implicit): class UnIndex(Persistent, Implicit, SimpleItem):
"""UnIndex object interface""" """UnIndex object interface"""
......
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