Skip to content

Z
Zope
Commit e05de84e authored by Michel Pelletier's avatar Michel Pelletier
Browse files
Options

Ok Jim, here's your unitabified version.

parent afcd50c3
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 132 deletions
lib/python/Products/ZCatalog/ZCatalog.py
View file @ e05de84e
...@@ -102,12 +102,12 @@ import IOBTree ...@@ -102,12 +102,12 @@ import IOBTree
manage_addZCatalogForm=HTMLFile('addZCatalog',globals()) manage_addZCatalogForm=HTMLFile('addZCatalog',globals())
def manage_addZCatalog(self,id,title,REQUEST=None): def manage_addZCatalog(self,id,title,REQUEST=None):
"""Add a ZCatalog object """Add a ZCatalog object
""" """
c=ZCatalog(id,title) c=ZCatalog(id,title)
self._setObject(id,c) self._setObject(id,c)
if REQUEST is not None: if REQUEST is not None:
return self.manage_main(self,REQUEST) return self.manage_main(self,REQUEST)
class ZCatalog(Folder, FindSupport, Persistent, Implicit): class ZCatalog(Folder, FindSupport, Persistent, Implicit):
...@@ -117,7 +117,7 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -117,7 +117,7 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
icon='misc_/ZCatalog/ZCatalog.gif' icon='misc_/ZCatalog/ZCatalog.gif'
manage_options=( manage_options=(
{'label': 'Contents', 'action': 'manage_main', {'label': 'Contents', 'action': 'manage_main',
'target': 'manage_main'}, 'target': 'manage_main'},
{'label': 'Cataloged Objects', 'action': 'manage_catalogView', {'label': 'Cataloged Objects', 'action': 'manage_catalogView',
...@@ -128,30 +128,30 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -128,30 +128,30 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
'target':'manage_main'}, 'target':'manage_main'},
{'label': 'Indexes', 'action': 'manage_catalogIndexes', {'label': 'Indexes', 'action': 'manage_catalogIndexes',
'target':'manage_main'}, 'target':'manage_main'},
{'label': 'Status', 'action': 'manage_catalogStatus', {'label': 'Status', 'action': 'manage_catalogStatus',
'target':'manage_main'}, 'target':'manage_main'},
) )
__ac_permissions__=( __ac_permissions__=(
('Manage ZCatalog Entries', ('Manage ZCatalog Entries',
['manage_catalogObject', 'manage_uncatalogObject', ['manage_catalogObject', 'manage_uncatalogObject',
'catalog_object', 'uncatalog_object', 'catalog_object', 'uncatalog_object',
'manage_catalogView', 'manage_catalogFind', 'manage_catalogView', 'manage_catalogFind',
'manage_catalogSchema', 'manage_catalogIndexes', 'manage_catalogSchema', 'manage_catalogIndexes',
'manage_catalogStatus', 'manage_catalogStatus',
'manage_catalogReindex', 'manage_catalogFoundItems', 'manage_catalogReindex', 'manage_catalogFoundItems',
'manage_catalogClear', 'manage_addColumn', 'manage_delColumns', 'manage_catalogClear', 'manage_addColumn', 'manage_delColumns',
'manage_addIndex', 'manage_delIndexs', 'manage_main',], 'manage_addIndex', 'manage_delIndexs', 'manage_main',],
['Manager']), ['Manager']),
('Search ZCatalog', ('Search ZCatalog',
['searchResults', '__call__', 'uniqueValuesFor', ['searchResults', '__call__', 'uniqueValuesFor',
'getpath', 'schema', 'indexes', 'index_objects', 'getpath', 'schema', 'indexes', 'index_objects',
'all_meta_types', 'valid_roles', 'resolve_url',], 'all_meta_types', 'valid_roles', 'resolve_url',],
['Anonymous', 'Manager']), ['Anonymous', 'Manager']),
) )
...@@ -171,36 +171,36 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -171,36 +171,36 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
self._v_total = 0 self._v_total = 0
self._catalog = Catalog() self._catalog = Catalog()
self._catalog.addColumn('id') self._catalog.addColumn('id')
self._catalog.addIndex('id', 'FieldIndex') self._catalog.addIndex('id', 'FieldIndex')
self._catalog.addColumn('title') self._catalog.addColumn('title')
self._catalog.addIndex('title', 'TextIndex') self._catalog.addIndex('title', 'TextIndex')
self._catalog.addColumn('meta_type') self._catalog.addColumn('meta_type')
self._catalog.addIndex('meta_type', 'FieldIndex') self._catalog.addIndex('meta_type', 'FieldIndex')
self._catalog.addColumn('bobobase_modification_time') self._catalog.addColumn('bobobase_modification_time')
self._catalog.addIndex('bobobase_modification_time', 'FieldIndex') self._catalog.addIndex('bobobase_modification_time', 'FieldIndex')
self._catalog.addColumn('summary') self._catalog.addColumn('summary')
self._catalog.addIndex('PrincipiaSearchSource', 'TextIndex') self._catalog.addIndex('PrincipiaSearchSource', 'TextIndex')
def manage_edit(self, threshold=1000, REQUEST=None): def manage_edit(self, threshold=1000, REQUEST=None):
""" edit the catalog """ """ edit the catalog """
self.threshold = threshold self.threshold = threshold
message = "Object changed" message = "Object changed"
return self.manage_main(self, REQUEST, return self.manage_main(self, REQUEST,
manage_tabs_message=message) manage_tabs_message=message)
def manage_catalogObject(self, REQUEST, urls=None, blah=None): def manage_catalogObject(self, REQUEST, urls=None, blah=None):
""" index all Zope objects that 'urls' point to """ """ index all Zope objects that 'urls' point to """
if urls: if urls:
for url in urls: for url in urls:
try: try:
# if an error happens here, the catalog will be in # if an error happens here, the catalog will be in
# an unstable state. If this happens, ignore the # an unstable state. If this happens, ignore the
...@@ -209,57 +209,57 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -209,57 +209,57 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
except: except:
continue continue
self.catalog_object(obj, url) self.catalog_object(obj, url)
message = "Objects Cataloged" message = "Objects Cataloged"
return self.manage_main(self, REQUEST, return self.manage_main(self, REQUEST,
manage_tabs_message=message) manage_tabs_message=message)
def manage_uncatalogObject(self, REQUEST, urls=None): def manage_uncatalogObject(self, REQUEST, urls=None):
""" removes Zope object 'urls' from catalog """ """ removes Zope object 'urls' from catalog """
if urls: if urls:
for url in urls: for url in urls:
try: try:
obj = self.resolve_url(url, REQUEST) obj = self.resolve_url(url, REQUEST)
except: except:
continue continue
self.uncatalog_object(url) self.uncatalog_object(url)
message = "Object UnCataloged" message = "Object UnCataloged"
return self.manage_main(self, REQUEST, return self.manage_main(self, REQUEST,
manage_tabs_message=message) manage_tabs_message=message)
def manage_catalogReindex(self, REQUEST): def manage_catalogReindex(self, REQUEST):
""" iterate over the whole catalog, deleting inexistent """ iterate over the whole catalog, deleting inexistent
references and refreshing objects""" references and refreshing objects"""
items = tuple(self._catalog.uids.items()) items = tuple(self._catalog.uids.items())
# self._catalog.clear() # self._catalog.clear()
for path, i in items: for path, i in items:
try: try:
obj = self.resolve_url(path, REQUEST) obj = self.resolve_url(path, REQUEST)
except: except:
self.uncatalog_object(path) self.uncatalog_object(path)
else: else:
self.uncatalog_object(path) self.uncatalog_object(path)
self.catalog_object(obj, path) self.catalog_object(obj, path)
message = "Catalog Reindexed" message = "Catalog Reindexed"
return self.manage_main(self, REQUEST, return self.manage_main(self, REQUEST,
manage_tabs_message=message) manage_tabs_message=message)
def manage_catalogClear(self, REQUEST): def manage_catalogClear(self, REQUEST):
""" clears the whole enchelada """ """ clears the whole enchelada """
self._catalog.clear() self._catalog.clear()
message = "Catalog Cleared" message = "Catalog Cleared"
return self.manage_main(self, REQUEST, return self.manage_main(self, REQUEST,
manage_tabs_message=message) manage_tabs_message=message)
def manage_catalogFoundItems(self, REQUEST, obj_metatypes=None, def manage_catalogFoundItems(self, REQUEST, obj_metatypes=None,
...@@ -286,85 +286,85 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -286,85 +286,85 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
self.catalog_object(n[1], n[0]) self.catalog_object(n[1], n[0])
message = "Objects Cataloged" message = "Objects Cataloged"
return self.manage_main(self, REQUEST, return self.manage_main(self, REQUEST,
manage_tabs_message=message) manage_tabs_message=message)
def manage_addColumn(self, name, REQUEST): def manage_addColumn(self, name, REQUEST):
""" add a column """ """ add a column """
self._catalog.addColumn(name) self._catalog.addColumn(name)
message = "Column added" message = "Column added"
return self.manage_catalogSchema(self, REQUEST, return self.manage_catalogSchema(self, REQUEST,
manage_tabs_message=message) manage_tabs_message=message)
def manage_delColumns(self, names, REQUEST): def manage_delColumns(self, names, REQUEST):
""" del a column """ """ del a column """
for name in names: for name in names:
self._catalog.delColumn(name) self._catalog.delColumn(name)
message = "Columns deleted" message = "Columns deleted"
return self.manage_catalogSchema(self, REQUEST, return self.manage_catalogSchema(self, REQUEST,
manage_tabs_message=message) manage_tabs_message=message)
def manage_addIndex(self, name, type, REQUEST): def manage_addIndex(self, name, type, REQUEST):
""" add an index """ """ add an index """
self._catalog.addIndex(name, type) self._catalog.addIndex(name, type)
message = "Index added" message = "Index added"
return self.manage_catalogIndexes(self, REQUEST, return self.manage_catalogIndexes(self, REQUEST,
manage_tabs_message=message) manage_tabs_message=message)
def manage_delIndexes(self, names, REQUEST): def manage_delIndexes(self, names, REQUEST):
""" del an index """ """ del an index """
for name in names: for name in names:
self._catalog.delIndex(name) self._catalog.delIndex(name)
message = "Indexes deleted" message = "Indexes deleted"
return self.manage_catalogIndexes(self, REQUEST, return self.manage_catalogIndexes(self, REQUEST,
manage_tabs_message=message) manage_tabs_message=message)
def catalog_object(self, obj, uid): def catalog_object(self, obj, uid):
""" wrapper around catalog """ """ wrapper around catalog """
if not hasattr(self, '_v_total'): if not hasattr(self, '_v_total'):
self._v_total = 0 self._v_total = 0
self._v_total = (self._v_total + self._v_total = (self._v_total +
self._catalog.catalogObject(obj, uid, self.threshold)) self._catalog.catalogObject(obj, uid, self.threshold))
if self._v_total > self.threshold: if self._v_total > self.threshold:
get_transaction().commit(1) get_transaction().commit(1)
self._v_total = 0 self._v_total = 0
def uncatalog_object(self, uid): def uncatalog_object(self, uid):
""" wrapper around catalog """ """ wrapper around catalog """
self._catalog.uncatalogObject(uid) self._catalog.uncatalogObject(uid)
def uniqueValuesFor(self, name): def uniqueValuesFor(self, name):
""" returns the unique values for a given FieldIndex """ """ returns the unique values for a given FieldIndex """
return self._catalog.uniqueValuesFor(name) return self._catalog.uniqueValuesFor(name)
def getpath(self, rid): def getpath(self, rid):
return self._catalog.paths[rid] return self._catalog.paths[rid]
def schema(self): def schema(self):
return self._catalog.schema.keys() return self._catalog.schema.keys()
def indexes(self): def indexes(self):
return self._catalog.indexes.keys() return self._catalog.indexes.keys()
def index_objects(self): def index_objects(self):
return self._catalog.indexes.values() return self._catalog.indexes.values()
def _searchable_arguments(self): def _searchable_arguments(self):
r = {} r = {}
n={'optional':1} n={'optional':1}
for name in self._catalog.indexes.keys(): for name in self._catalog.indexes.keys():
r[name]=n r[name]=n
...@@ -372,31 +372,31 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -372,31 +372,31 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
def _searchable_result_columns(self): def _searchable_result_columns(self):
r = [] r = []
for name in self._catalog.indexes.keys(): for name in self._catalog.indexes.keys():
i = {} i = {}
i['name'] = name i['name'] = name
i['type'] = 's' i['type'] = 's'
i['parser'] = str i['parser'] = str
i['width'] = 8 i['width'] = 8
r.append(i) r.append(i)
return r return r
def searchResults(self, REQUEST=None, used=None, def searchResults(self, REQUEST=None, used=None,
query_map={ query_map={
type(regex.compile('')): Query.Regex, type(regex.compile('')): Query.Regex,
type([]): orify, type([]): orify,
type(''): Query.String, type(''): Query.String,
}, **kw): }, **kw):
""" """
Search the catalog according to the ZTables search interface. Search the catalog according to the ZTables search interface.
Search terms can be passed in the REQUEST or as keyword Search terms can be passed in the REQUEST or as keyword
arguments. arguments.
""" """
return apply(self._catalog.searchResults, return apply(self._catalog.searchResults,
(REQUEST,used, query_map), kw) (REQUEST,used, query_map), kw)
__call__=searchResults __call__=searchResults
......
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