Commit 6f33860d authored by Michel Pelletier's avatar Michel Pelletier

beautificated

parent cfd505d9
...@@ -95,7 +95,6 @@ import Products ...@@ -95,7 +95,6 @@ import Products
from Acquisition import Implicit from Acquisition import Implicit
from Persistence import Persistent from Persistence import Persistent
from Catalog import Catalog, orify from Catalog import Catalog, orify
import pdb, traceback
from SearchIndex import UnIndex, UnTextIndex from SearchIndex import UnIndex, UnTextIndex
import IOBTree import IOBTree
...@@ -197,7 +196,6 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -197,7 +196,6 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
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:
...@@ -323,7 +321,6 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -323,7 +321,6 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
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'):
...@@ -411,9 +408,7 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -411,9 +408,7 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
__call__=searchResults __call__=searchResults
## this stuff is so the find machinery works
# this stuff is so the find machinery works
meta_types=() # Sub-object types that are specific to this object meta_types=() # Sub-object types that are specific to this object
...@@ -445,9 +440,7 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -445,9 +440,7 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
roles.sort() roles.sort()
return roles return roles
## stolen from ZPublisher and modified slightly
# stolen from ZPublisher and modified slightly
def resolve_url(self, path, REQUEST): def resolve_url(self, path, REQUEST):
""" The use of this function is depricated """ """ The use of this function is depricated """
...@@ -473,9 +466,6 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -473,9 +466,6 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
# waaa - traversal may return a "default object" # waaa - traversal may return a "default object"
# like an index_html document, though you really # like an index_html document, though you really
# wanted to get a Folder back :( # wanted to get a Folder back :(
## print path
## print `object`
## print (str(req.PARENTS))
if hasattr(object, 'id'): if hasattr(object, 'id'):
if callable(object.id): if callable(object.id):
...@@ -485,7 +475,6 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -485,7 +475,6 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
name=object.__name__ name=object.__name__
else: name='' else: name=''
if name != os.path.split(path)[-1]: if name != os.path.split(path)[-1]:
result = req.PARENTS[0] result = req.PARENTS[0]
req.close() req.close()
......
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