Skip to content

Z
Zope
Commit 2f2ef92f authored by Andreas Jung's avatar Andreas Jung
Browse files
Options 

     - PathIndex and TopicIndex are now using a counter for the number
       of indexed objects instead of using a very expensive calculation
       based on the keys of their indexes.
parent 5dfe4e63
Show whitespace changes
Inline Side-by-side
Showing with 145 additions and 283 deletions
doc/CHANGES.txt
View file @ 2f2ef92f
...@@ -13,6 +13,10 @@ Zope Changes ...@@ -13,6 +13,10 @@ Zope Changes
Bugs fixed Bugs fixed
- PathIndex and TopicIndex are now using a counter for the number
of indexed objects instead of using a very expensive calculation
based on the keys of their indexes.
- backport of TAL fixes from z3 - backport of TAL fixes from z3
* i18n and metal interactions * i18n and metal interactions
......
lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
View file @ 2f2ef92f
...@@ -11,26 +11,26 @@ ...@@ -11,26 +11,26 @@
# #
############################################################################## ##############################################################################
__version__ = '$Id: PathIndex.py,v 1.35 2003/06/17 19:01:07 sidnei Exp $' __version__ = '$Id: PathIndex.py,v 1.36 2003/08/16 16:44:42 andreasjung Exp $'
from Products.PluginIndexes import PluggableIndex import warnings
from Products.PluginIndexes.common.util import parseIndexRequest from types import StringType, ListType, TupleType
from Products.PluginIndexes.common import safe_callable
from Globals import Persistent, DTMLFile from Globals import Persistent, DTMLFile
from Acquisition import Implicit from OFS.SimpleItem import SimpleItem
from BTrees.IOBTree import IOBTree from BTrees.IOBTree import IOBTree
from BTrees.OOBTree import OOBTree from BTrees.OOBTree import OOBTree
from BTrees.IIBTree import IITreeSet, IISet, intersection, union from BTrees.IIBTree import IITreeSet, IISet, intersection, union
from OFS.SimpleItem import SimpleItem from BTrees.Length import Length
from zLOG import LOG, ERROR from zLOG import LOG, ERROR
from types import StringType, ListType, TupleType
import warnings from Products.PluginIndexes import PluggableIndex
from Products.PluginIndexes.common.util import parseIndexRequest
from Products.PluginIndexes.common import safe_callable
_marker = [] _marker = []
class PathIndex(Persistent, Implicit, SimpleItem): class PathIndex(Persistent, 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:
...@@ -41,7 +41,7 @@ class PathIndex(Persistent, Implicit, SimpleItem): ...@@ -41,7 +41,7 @@ class PathIndex(Persistent, Implicit, SimpleItem):
- every component is kept as a key of a OOBTree in self._indexes - every component is kept as a key of a OOBTree in self._indexes
- the value is a mapping 'level of the path component' to - the value is a mapping 'level of the path component' to
'all documentIds with this path component on this level' 'all docids with this path component on this level'
""" """
...@@ -55,32 +55,25 @@ class PathIndex(Persistent, Implicit, SimpleItem): ...@@ -55,32 +55,25 @@ class PathIndex(Persistent, Implicit, SimpleItem):
'help': ('PathIndex','PathIndex_Settings.stx')}, 'help': ('PathIndex','PathIndex_Settings.stx')},
) )
query_options = ["query", "level", "operator"] query_options = ("query", "level", "operator")
def __init__(self,id,caller=None): def __init__(self,id,caller=None):
self.id = id self.id = id
self.operators = ('or','and')
# experimental code for specifing the operator
self.operators = ['or','and']
self.useOperator = 'or' self.useOperator = 'or'
self.clear() self.clear()
def clear(self): def clear(self):
""" clear everything """
self._depth = 0 self._depth = 0
self._index = OOBTree() self._index = OOBTree()
self._unindex = IOBTree() self._unindex = IOBTree()
self._length = Length(0)
def insertEntry(self, comp, id, level): def insertEntry(self, comp, id, level):
"""Insert an entry. """Insert an entry.
comp is a path component (generated by splitPath() ) comp is a path component
id is the documentId id is the docid
level is the level of the component inside the path level is the level of the component inside the path
""" """
...@@ -94,16 +87,11 @@ class PathIndex(Persistent, Implicit, SimpleItem): ...@@ -94,16 +87,11 @@ class PathIndex(Persistent, Implicit, SimpleItem):
if level > self._depth: if level > self._depth:
self._depth = level self._depth = level
def index_object(self, docid, obj ,threshold=100):
def index_object(self, documentId, obj ,threshold=100):
""" hook for (Z)Catalog """ """ hook for (Z)Catalog """
# first we check if the object provide an attribute or f = getattr(obj, self.id, None)
# method to be used as hook for the PathIndex if f is not None:
if hasattr(obj, self.id):
f = getattr(obj, self.id)
if safe_callable(f): if safe_callable(f):
try: try:
path = f() path = f()
...@@ -112,8 +100,7 @@ class PathIndex(Persistent, Implicit, SimpleItem): ...@@ -112,8 +100,7 @@ class PathIndex(Persistent, Implicit, SimpleItem):
else: else:
path = f path = f
if not (isinstance(path, StringType) or if not isinstance(path, (StringType, TupleType)):
isinstance(path, TupleType)):
raise TypeError('path value must be string or tuple of strings') raise TypeError('path value must be string or tuple of strings')
else: else:
try: try:
...@@ -121,36 +108,34 @@ class PathIndex(Persistent, Implicit, SimpleItem): ...@@ -121,36 +108,34 @@ class PathIndex(Persistent, Implicit, SimpleItem):
except AttributeError: except AttributeError:
return 0 return 0
if type(path) in (ListType, TupleType): if isinstance(path, (ListType, TupleType)):
path = '/'+ '/'.join(path[1:]) path = '/'+ '/'.join(path[1:])
comps = filter(None, path.split('/'))
comps = self.splitPath(path, obj) if not self._unindex.has_key(docid):
self._length.change(1)
for i in range(len(comps)): for i in range(len(comps)):
self.insertEntry(comps[i], documentId, i) self.insertEntry(comps[i], docid, i)
self._unindex[docid] = path
self._unindex[documentId] = path
return 1 return 1
def unindex_object(self, docid):
def unindex_object(self, documentId):
""" hook for (Z)Catalog """ """ hook for (Z)Catalog """
if not self._unindex.has_key(documentId): if not self._unindex.has_key(docid):
LOG(self.__class__.__name__, ERROR, LOG(self.__class__.__name__, ERROR,
'Attempt to unindex nonexistent document' 'Attempt to unindex nonexistent document'
' with id %s' % documentId) ' with id %s' % docid)
return return
path = self._unindex[documentId] comps = self._unindex[docid].split('/')
comps = path.split('/')
for level in range(len(comps[1:])): for level in range(len(comps[1:])):
comp = comps[level+1] comp = comps[level+1]
try: try:
self._index[comp][level].remove(documentId) self._index[comp][level].remove(docid)
if not self._index[comp][level]: if not self._index[comp][level]:
del self._index[comp][level] del self._index[comp][level]
...@@ -160,34 +145,10 @@ class PathIndex(Persistent, Implicit, SimpleItem): ...@@ -160,34 +145,10 @@ class PathIndex(Persistent, Implicit, SimpleItem):
except KeyError: except KeyError:
LOG(self.__class__.__name__, ERROR, LOG(self.__class__.__name__, ERROR,
'Attempt to unindex document' 'Attempt to unindex document'
' with id %s failed' % documentId) ' with id %s failed' % docid)
del self._unindex[documentId]
def printIndex(self):
for k,v in self._index.items():
print "-"*78
print k
for k1,v1 in v.items():
print k1,v1,
print
def splitPath(self, path, obj=None):
""" split physical path of object. If the object has
as function splitPath() we use this user-defined function
to split the path
"""
if hasattr(obj, "splitPath"):
comps = obj.splitPath(path)
else:
comps = filter(None, path.split('/'))
return comps
self._length.change(-1)
del self._unindex[docid]
def search(self, path, default_level=0): def search(self, path, default_level=0):
""" """
...@@ -199,95 +160,61 @@ class PathIndex(Persistent, Implicit, SimpleItem): ...@@ -199,95 +160,61 @@ class PathIndex(Persistent, Implicit, SimpleItem):
level < 0 not implemented yet level < 0 not implemented yet
""" """
if isinstance(path,StringType): if isinstance(path, StringType):
level = default_level level = default_level
else: else:
level = int(path[1]) level = int(path[1])
path = path[0] path = path[0]
comps = self.splitPath(path) comps = filter(None, path.split('/'))
if len(comps) == 0: if len(comps) == 0:
return IISet(self._unindex.keys()) return IISet(self._unindex.keys())
if level >= 0: if level >= 0:
results = [] results = []
for i in range(len(comps)): for i in range(len(comps)):
comp = comps[i] comp = comps[i]
if not self._index.has_key(comp): return IISet() if not self._index.has_key(comp): return IISet()
if not self._index[comp].has_key(level+i): return IISet() if not self._index[comp].has_key(level+i): return IISet()
results.append( self._index[comp][level+i] ) results.append( self._index[comp][level+i] )
res = results[0] res = results[0]
for i in range(1,len(results)): for i in range(1,len(results)):
res = intersection(res,results[i]) res = intersection(res,results[i])
return res return res
else: else:
results = IISet() results = IISet()
for level in range(0,self._depth + 1): for level in range(0,self._depth + 1):
ids = None ids = None
error = 0 error = 0
for cn in range(0,len(comps)): for cn in range(0,len(comps)):
comp = comps[cn] comp = comps[cn]
try: try:
ids = intersection(ids,self._index[comp][level+cn]) ids = intersection(ids,self._index[comp][level+cn])
except KeyError: except KeyError:
error = 1 error = 1
if error==0: if error==0:
results = union(results,ids) results = union(results,ids)
return results return results
def __len__(self):
""" len """
# XXX REALLY inefficient
return len(self._index)
def numObjects(self): def numObjects(self):
""" return the number of indexed objects""" """ return the number of indexed objects"""
# XXX REALLY inefficient try:
return len(self._unindex) return self._length()
except AttributeError: # backward compatibility
l = len(self._unindex)
def keys(self): self._length = Length(l)
""" return list of all path components """ return l
# XXX Could this be lazy, does it need to be a list?
return list(self._index.keys())
def values(self):
# XXX Could this be lazy, does it need to be a list?
return list(self._index.values())
def items(self):
""" mapping path components : documentIds """
# XXX Could this be lazy, does it need to be a list?
return list(self._index.items())
def _apply_index(self, request, cid=''): def _apply_index(self, request, cid=''):
""" hook for (Z)Catalog """ hook for (Z)Catalog
request mapping type (usually {"path": "..." } 'request' -- mapping type (usually {"path": "..." }
additionaly a parameter "path_level" might be passed additionaly a parameter "path_level" might be passed
to specify the level (see search()) to specify the level (see search())
cid ??? 'cid' -- ???
""" """
record = parseIndexRequest(request,self.id,self.query_options) record = parseIndexRequest(request,self.id,self.query_options)
...@@ -299,19 +226,14 @@ class PathIndex(Persistent, Implicit, SimpleItem): ...@@ -299,19 +226,14 @@ class PathIndex(Persistent, Implicit, SimpleItem):
"Please use a mapping object and the " "Please use a mapping object and the "
"'level' key to specify the operator." % cid) "'level' key to specify the operator." % cid)
# get the level parameter
level = record.get("level",0) level = record.get("level",0)
# experimental code for specifing the operator
operator = record.get('operator',self.useOperator).lower() operator = record.get('operator',self.useOperator).lower()
# depending on the operator we use intersection of union # depending on the operator we use intersection of union
if operator=="or": set_func = union if operator == "or": set_func = union
else: set_func = intersection else: set_func = intersection
res = None res = None
for k in record.keys: for k in record.keys:
rows = self.search(k,level) rows = self.search(k,level)
res = set_func(res,rows) res = set_func(res,rows)
...@@ -325,27 +247,24 @@ class PathIndex(Persistent, Implicit, SimpleItem): ...@@ -325,27 +247,24 @@ class PathIndex(Persistent, Implicit, SimpleItem):
"""has unique values for column name""" """has unique values for column name"""
return name == self.id return name == self.id
def uniqueValues(self, name=None, withLength=0): def uniqueValues(self, name=None, withLength=0):
""" needed to be consistent with the interface """ """ needed to be consistent with the interface """
return self._index.keys() return self._index.keys()
def getIndexSourceNames(self): def getIndexSourceNames(self):
""" return names of indexed attributes """ """ return names of indexed attributes """
return ('getPhysicalPath', ) return ('getPhysicalPath', )
def getEntryForObject(self, docid, default=_marker):
def getEntryForObject(self, documentId, default=_marker): """ Takes a document ID and returns all the information
""" Takes a document ID and returns all the information we have we have on that specific object.
on that specific object. """ """
try: try:
return self._unindex[documentId] return self._unindex[docid]
except KeyError: except KeyError:
# XXX Why is default ignored? # XXX Why is default ignored?
return None return None
index_html = DTMLFile('dtml/index', globals()) index_html = DTMLFile('dtml/index', globals())
manage_workspace = DTMLFile('dtml/managePathIndex', globals()) manage_workspace = DTMLFile('dtml/managePathIndex', globals())
......
lib/python/Products/PluginIndexes/PathIndex/tests/testPathIndex.py
View file @ 2f2ef92f
...@@ -15,17 +15,16 @@ import os, sys, unittest ...@@ -15,17 +15,16 @@ import os, sys, unittest
from Products.PluginIndexes.PathIndex.PathIndex import PathIndex from Products.PluginIndexes.PathIndex.PathIndex import PathIndex
class Dummy: class Dummy:
meta_type="foo" meta_type="foo"
def __init__( self, path): def __init__( self, path):
self.path = path self.path = path
def getPhysicalPath(self): def getPhysicalPath(self):
return self.path.split('/') return self.path.split('/')
def __str__( self ): def __str__( self ):
return '<Dummy: %s>' % self.path return '<Dummy: %s>' % self.path
...@@ -62,25 +61,35 @@ class TestCase( unittest.TestCase ): ...@@ -62,25 +61,35 @@ class TestCase( unittest.TestCase ):
self._index.index_object( k, v ) self._index.index_object( k, v )
def testEmpty(self): def testEmpty(self):
self.assertEqual(self._index.numObjects() ,0)
assert len( self._index ) == 0 self.assertEqual(self._index.getEntryForObject(1234), None)
assert self._index.getEntryForObject( 1234 ) is None
self._index.unindex_object( 1234 ) # nothrow self._index.unindex_object( 1234 ) # nothrow
assert self._index._apply_index( {"suxpath":"xxx"} ) is None self.assertEqual(self._index._apply_index({"suxpath":"xxx"}), None)
def testUnIndex(self): def testUnIndex(self):
self._populateIndex() self._populateIndex()
self.assertEqual(self._index.numObjects(), 18)
for k in self._values.keys(): for k in self._values.keys():
self._index.unindex_object(k) self._index.unindex_object(k)
assert len(self._index._index)==0 self.assertEqual(self._index.numObjects(), 0)
assert len(self._index._unindex)==0 self.assertEqual(len(self._index._index), 0)
self.assertEqual(len(self._index._unindex), 0)
def testUnIndexError(self): def testReindex(self):
self._populateIndex() self._populateIndex()
self.assertEqual(self._index.numObjects(), 18)
o = Dummy('/foo/bar')
self._index.index_object(19, o)
self.assertEqual(self._index.numObjects(), 19)
self._index.index_object(19, o)
self.assertEqual(self._index.numObjects(), 19)
def testUnIndexError(self):
self._populateIndex()
# this should not raise an error # this should not raise an error
self._index.unindex_object(-1) self._index.unindex_object(-1)
...@@ -91,10 +100,7 @@ class TestCase( unittest.TestCase ): ...@@ -91,10 +100,7 @@ class TestCase( unittest.TestCase ):
def testRoot(self): def testRoot(self):
self._populateIndex() self._populateIndex()
tests = ( ("/",0, range(1,19)), )
tests = [
("/",0, range(1,19)),
]
for comp,level,results in tests: for comp,level,results in tests:
for path in [comp,"/"+comp,"/"+comp+"/"]: for path in [comp,"/"+comp,"/"+comp+"/"]:
...@@ -110,14 +116,10 @@ class TestCase( unittest.TestCase ): ...@@ -110,14 +116,10 @@ class TestCase( unittest.TestCase ):
lst = list(res[0].keys()) lst = list(res[0].keys())
self.assertEqual(lst,results) self.assertEqual(lst,results)
def testRoot(self): def testRoot(self):
self._populateIndex() self._populateIndex()
tests = ( ("/",0, range(1,19)), )
tests = [
("/",0, range(1,19)),
]
for comp,level,results in tests: for comp,level,results in tests:
for path in [comp,"/"+comp,"/"+comp+"/"]: for path in [comp,"/"+comp,"/"+comp+"/"]:
...@@ -137,7 +139,6 @@ class TestCase( unittest.TestCase ): ...@@ -137,7 +139,6 @@ class TestCase( unittest.TestCase ):
def testSimpleTests(self): def testSimpleTests(self):
self._populateIndex() self._populateIndex()
tests = [ tests = [
("aa", 0, [1,2,3,4,5,6,7,8,9]), ("aa", 0, [1,2,3,4,5,6,7,8,9]),
("aa", 1, [1,2,3,10,11,12] ), ("aa", 1, [1,2,3,10,11,12] ),
...@@ -172,7 +173,6 @@ class TestCase( unittest.TestCase ): ...@@ -172,7 +173,6 @@ class TestCase( unittest.TestCase ):
def testComplexOrTests(self): def testComplexOrTests(self):
self._populateIndex() self._populateIndex()
tests = [ tests = [
(['aa','bb'],1,[1,2,3,4,5,6,10,11,12,13,14,15]), (['aa','bb'],1,[1,2,3,4,5,6,10,11,12,13,14,15]),
(['aa','bb','xx'],1,[1,2,3,4,5,6,10,11,12,13,14,15]), (['aa','bb','xx'],1,[1,2,3,4,5,6,10,11,12,13,14,15]),
...@@ -189,7 +189,6 @@ class TestCase( unittest.TestCase ): ...@@ -189,7 +189,6 @@ class TestCase( unittest.TestCase ):
def testComplexANDTests(self): def testComplexANDTests(self):
self._populateIndex() self._populateIndex()
tests = [ tests = [
(['aa','bb'],1,[]), (['aa','bb'],1,[]),
([('aa',0),('bb',1)],0,[4,5,6]), ([('aa',0),('bb',1)],0,[4,5,6]),
...@@ -197,7 +196,6 @@ class TestCase( unittest.TestCase ): ...@@ -197,7 +196,6 @@ class TestCase( unittest.TestCase ):
] ]
for lst ,level,results in tests: for lst ,level,results in tests:
res = self._index._apply_index( res = self._index._apply_index(
{"path":{'query':lst,"level":level,"operator":"and"}}) {"path":{'query':lst,"level":level,"operator":"and"}})
lst = list(res[0].keys()) lst = list(res[0].keys())
......
lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py
View file @ 2f2ef92f
...@@ -11,22 +11,21 @@ ...@@ -11,22 +11,21 @@
# #
############################################################################## ##############################################################################
__version__ = '$Id: TopicIndex.py,v 1.13 2003/06/23 08:45:58 andreasjung Exp $' __version__ = '$Id: TopicIndex.py,v 1.14 2003/08/16 16:44:48 andreasjung Exp $'
from Products.PluginIndexes import PluggableIndex
from Products.PluginIndexes.common.util import parseIndexRequest
from Globals import Persistent, DTMLFile from Globals import Persistent, DTMLFile
from OFS.SimpleItem import SimpleItem from OFS.SimpleItem import SimpleItem
from Acquisition import Implicit from zLOG import ERROR, LOG
from BTrees.OOBTree import OOBTree from BTrees.OOBTree import OOBTree
from BTrees.IIBTree import IISet,intersection,union from BTrees.IIBTree import IISet,intersection,union
from zLOG import ERROR, LOG
import FilteredSet import FilteredSet
from Products.PluginIndexes import PluggableIndex
from Products.PluginIndexes.common.util import parseIndexRequest
_marker = [] _marker = []
class TopicIndex(Persistent, Implicit, SimpleItem): class TopicIndex(Persistent, 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
...@@ -37,6 +36,7 @@ class TopicIndex(Persistent, Implicit, SimpleItem): ...@@ -37,6 +36,7 @@ class TopicIndex(Persistent, Implicit, SimpleItem):
__implements__ = (PluggableIndex.PluggableIndexInterface,) __implements__ = (PluggableIndex.PluggableIndexInterface,)
meta_type="TopicIndex" meta_type="TopicIndex"
query_options = ('query','operator')
manage_options= ( manage_options= (
{'label': 'FilteredSets', {'label': 'FilteredSets',
...@@ -44,93 +44,59 @@ class TopicIndex(Persistent, Implicit, SimpleItem): ...@@ -44,93 +44,59 @@ class TopicIndex(Persistent, Implicit, SimpleItem):
'help': ('TopicIndex','TopicIndex_searchResults.stx')}, 'help': ('TopicIndex','TopicIndex_searchResults.stx')},
) )
manage_workspace = DTMLFile('dtml/manageTopicIndex',globals())
query_options = ('query','operator')
def __init__(self,id,caller=None): def __init__(self,id,caller=None):
self.id = id self.id = id
self.filteredSets = OOBTree() self.filteredSets = OOBTree()
# experimental code for specifing the operator
self.operators = ('or','and') self.operators = ('or','and')
self.defaultOperator = 'or' self.defaultOperator = 'or'
def getId(self): return self.id def getId(self): return self.id
def clear(self): def clear(self):
""" clear everything """
for fs in self.filteredSets.values(): for fs in self.filteredSets.values():
fs.clear() fs.clear()
def index_object(self, docid, obj ,threshold=100):
def index_object(self, documentId, obj ,threshold=100):
""" hook for (Z)Catalog """ """ hook for (Z)Catalog """
for fid, filteredSet in self.filteredSets.items(): for fid, filteredSet in self.filteredSets.items():
filteredSet.index_object(documentId,obj) filteredSet.index_object(docid,obj)
return 1 return 1
def unindex_object(self,docid):
def unindex_object(self,documentId):
""" hook for (Z)Catalog """ """ hook for (Z)Catalog """
for fs in self.filteredSets.values(): for fs in self.filteredSets.values():
try: try:
fs.unindex_object(documentId) fs.unindex_object(docid)
except KeyError: except KeyError:
LOG(self.__class__.__name__, ERROR, LOG(self.__class__.__name__, ERROR,
'Attempt to unindex document' 'Attempt to unindex document'
' with id %s failed' % documentId) ' with id %s failed' % docid)
return 1 return 1
def __len__(self):
""" len """
n=0
for fs in self.filteredSets.values():
n = n + len(fs.getIds())
return n
def numObjects(self): def numObjects(self):
return "N/A" return "n/a"
def keys(self): pass
def values(self): pass
def items(self): pass
def search(self,filterId):
if self.filteredSets.has_key(filterId):
return self.filteredSets[filterId].getIds()
def search(self,filter_id):
if self.filteredSets.has_key(filter_id):
return self.filteredSets[filter_id].getIds()
def _apply_index(self, request, cid=''): def _apply_index(self, request, cid=''):
""" hook for (Z)Catalog """ hook for (Z)Catalog
request mapping type (usually {"topic": "..." } 'request' -- mapping type (usually {"topic": "..." }
cid ??? 'cid' -- ???
""" """
record = parseIndexRequest(request,self.id,self.query_options) record = parseIndexRequest(request,self.id,self.query_options)
if record.keys==None: return None if record.keys is None: return None
# experimental code for specifing the operator
operator = record.get('operator',self.defaultOperator).lower()
# depending on the operator we use intersection of union operator = record.get('operator', self.defaultOperator).lower()
if operator=="or": set_func = union if operator == 'or': set_func = union
else: set_func = intersection else: set_func = intersection
res = None res = None
for filter_id in record.keys:
for filterId in record.keys: rows = self.search(filter_id)
rows = self.search(filterId)
res = set_func(res,rows) res = set_func(res,rows)
if res: if res:
...@@ -138,79 +104,65 @@ class TopicIndex(Persistent, Implicit, SimpleItem): ...@@ -138,79 +104,65 @@ class TopicIndex(Persistent, Implicit, SimpleItem):
else: else:
return IISet(), (self.id,) return IISet(), (self.id,)
def uniqueValues(self,name=None, withLength=0):
def uniqueValues(self,name=None,withLength=0):
""" needed to be consistent with the interface """ """ needed to be consistent with the interface """
return self.filteredSets.keys() return self.filteredSets.keys()
def getEntryForObject(self,docid, default=_marker):
def getEntryForObject(self,documentId,default=_marker):
""" Takes a document ID and returns all the information we have """ Takes a document ID and returns all the information we have
on that specific object. """ on that specific object.
"""
return self.filteredSets.keys() return self.filteredSets.keys()
def addFilteredSet(self, filter_id, typeFilteredSet, expr):
def addFilteredSet(self, filterId, typeFilteredSet, expr): if self.filteredSets.has_key(filter_id):
if self.filteredSets.has_key(filterId):
raise KeyError,\ raise KeyError,\
'A FilteredSet with this name already exists: %s' % filterId 'A FilteredSet with this name already exists: %s' % filter_id
self.filteredSets[filter_id] = \
self.filteredSets[filterId] = \ FilteredSet.factory(filter_id, typeFilteredSet, expr)
FilteredSet.factory(filterId, typeFilteredSet, expr)
def delFilteredSet(self,filterId): def delFilteredSet(self,filter_id):
if not self.filteredSets.has_key(filter_id):
if not self.filteredSets.has_key(filterId):
raise KeyError,\ raise KeyError,\
'no such FilteredSet: %s' % filterId 'no such FilteredSet: %s' % filter_id
del self.filteredSets[filter_id]
del self.filteredSets[filterId]
def clearFilteredSet(self,filterId): def clearFilteredSet(self,filter_id):
if not self.filteredSets.has_key(filter_id):
if not self.filteredSets.has_key(filterId):
raise KeyError,\ raise KeyError,\
'no such FilteredSet: %s' % filterId 'no such FilteredSet: %s' % filter_id
self.filteredSets[filter_id].clear()
self.filteredSets[filterId].clear()
def manage_addFilteredSet(self, filterId, typeFilteredSet, expr, URL1, \ def manage_addFilteredSet(self, filter_id, typeFilteredSet, expr, URL1, \
REQUEST=None,RESPONSE=None): REQUEST=None,RESPONSE=None):
""" add a new filtered set """ """ add a new filtered set """
if len(filterId)==0: raise RuntimeError,'Length of ID too short' if len(filter_id) == 0: raise RuntimeError,'Length of ID too short'
if len(expr)==0: raise RuntimeError,'Length of expression too short' if len(expr) == 0: raise RuntimeError,'Length of expression too short'
self.addFilteredSet(filterId, typeFilteredSet, expr) self.addFilteredSet(filter_id, typeFilteredSet, expr)
if RESPONSE: if RESPONSE:
RESPONSE.redirect(URL1+'/manage_workspace?' RESPONSE.redirect(URL1+'/manage_workspace?'
'manage_tabs_message=FilteredSet%20added') 'manage_tabs_message=FilteredSet%20added')
def manage_delFilteredSet(self, filter_ids=[], URL1=None, \
def manage_delFilteredSet(self, filterIds=[], URL1=None, \
REQUEST=None,RESPONSE=None): REQUEST=None,RESPONSE=None):
""" delete a list of FilteredSets""" """ delete a list of FilteredSets"""
for filterId in filterIds: for filter_id in filter_ids:
self.delFilteredSet(filterId) self.delFilteredSet(filter_id)
if RESPONSE: if RESPONSE:
RESPONSE.redirect(URL1+'/manage_workspace?' RESPONSE.redirect(URL1+'/manage_workspace?'
'manage_tabs_message=FilteredSet(s)%20deleted') 'manage_tabs_message=FilteredSet(s)%20deleted')
def manage_saveFilteredSet(self,filter_id, expr, URL1=None,\
def manage_saveFilteredSet(self,filterId, expr, URL1=None,\
REQUEST=None,RESPONSE=None): REQUEST=None,RESPONSE=None):
""" save expression for a FilteredSet """ """ save expression for a FilteredSet """
self.filteredSets[filterId].setExpression(expr) self.filteredSets[filter_id].setExpression(expr)
if RESPONSE: if RESPONSE:
RESPONSE.redirect(URL1+'/manage_workspace?' RESPONSE.redirect(URL1+'/manage_workspace?'
...@@ -220,21 +172,21 @@ class TopicIndex(Persistent, Implicit, SimpleItem): ...@@ -220,21 +172,21 @@ class TopicIndex(Persistent, Implicit, SimpleItem):
""" return names of indexed attributes """ """ return names of indexed attributes """
return ('n/a',) return ('n/a',)
def manage_clearFilteredSet(self, filter_ids=[], URL1=None, \
def manage_clearFilteredSet(self, filterIds=[], URL1=None, \
REQUEST=None,RESPONSE=None): REQUEST=None,RESPONSE=None):
""" clear a list of FilteredSets""" """ clear a list of FilteredSets"""
for filterId in filterIds: for filter_id in filter_ids:
self.clearFilteredSet(filterId) self.clearFilteredSet(filter_id)
if RESPONSE: if RESPONSE:
RESPONSE.redirect(URL1+'/manage_workspace?' RESPONSE.redirect(URL1+'/manage_workspace?'
'manage_tabs_message=FilteredSet(s)%20cleared') 'manage_tabs_message=FilteredSet(s)%20cleared')
editFilteredSet = DTMLFile('dtml/editFilteredSet',globals())
index_html = DTMLFile('dtml/index', globals()) index_html = DTMLFile('dtml/index', globals())
manage_workspace = DTMLFile('dtml/manageTopicIndex',globals())
editFilteredSet = DTMLFile('dtml/editFilteredSet',globals())
manage_addTopicIndexForm = DTMLFile('dtml/addTopicIndex', globals()) manage_addTopicIndexForm = DTMLFile('dtml/addTopicIndex', globals())
......
lib/python/Products/PluginIndexes/TopicIndex/tests/testTopicIndex.py
View file @ 2f2ef92f
...@@ -11,12 +11,11 @@ ...@@ -11,12 +11,11 @@
# #
############################################################################## ##############################################################################
import os ,sys, re, unittest
import ZODB import ZODB
import os,sys,re,unittest
from Products.PluginIndexes.TopicIndex.TopicIndex import TopicIndex from Products.PluginIndexes.TopicIndex.TopicIndex import TopicIndex
class Obj: class Obj:
def __init__(self,id,meta_type=''): def __init__(self,id,meta_type=''):
...@@ -26,8 +25,6 @@ class Obj: ...@@ -26,8 +25,6 @@ class Obj:
def getId(self): return self.id def getId(self): return self.id
def getPhysicalPath(self): return self.id def getPhysicalPath(self): return self.id
class TestBase(unittest.TestCase): class TestBase(unittest.TestCase):
def _searchAnd(self,query,expected): def _searchAnd(self,query,expected):
...@@ -36,19 +33,15 @@ class TestBase(unittest.TestCase): ...@@ -36,19 +33,15 @@ class TestBase(unittest.TestCase):
def _searchOr(self,query,expected): def _searchOr(self,query,expected):
return self._search(query,'or',expected) return self._search(query,'or',expected)
def _search(self,query,operator,expected): def _search(self,query,operator,expected):
res = self.TI._apply_index({'topic':{'query':query,'operator':operator}}) res = self.TI._apply_index({'topic':{'query':query,'operator':operator}})
rows = list(res[0]) rows = list(res[0])
rows.sort() rows.sort()
expected.sort() expected.sort()
self.assertEqual(rows,expected,query) self.assertEqual(rows,expected,query)
return rows return rows
class TestTopicIndex(TestBase): class TestTopicIndex(TestBase):
def setUp(self): def setUp(self):
...@@ -66,7 +59,6 @@ class TestTopicIndex(TestBase): ...@@ -66,7 +59,6 @@ class TestTopicIndex(TestBase):
def testOr(self): def testOr(self):
self._searchOr('doc1',[1,2]) self._searchOr('doc1',[1,2])
self._searchOr(['doc1'],[1,2]) self._searchOr(['doc1'],[1,2])
self._searchOr('doc2',[3,4]), self._searchOr('doc2',[3,4]),
...@@ -75,15 +67,12 @@ class TestTopicIndex(TestBase): ...@@ -75,15 +67,12 @@ class TestTopicIndex(TestBase):
def testAnd(self): def testAnd(self):
self._searchAnd('doc1',[1,2]) self._searchAnd('doc1',[1,2])
self._searchAnd(['doc1'],[1,2]) self._searchAnd(['doc1'],[1,2])
self._searchAnd('doc2',[3,4]) self._searchAnd('doc2',[3,4])
self._searchAnd(['doc2'],[3,4]) self._searchAnd(['doc2'],[3,4])
self._searchAnd(['doc1','doc2'],[]) self._searchAnd(['doc1','doc2'],[])
def test_suite(): def test_suite():
return unittest.TestSuite( ( return unittest.TestSuite( (
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7