rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gen] Cleaner and more robust approach when using Zope database indexes.

Browse source
This commit is contained in:
Gaetan Delannay 2012-09-04 18:00:22 +02:00
parent 5c2d94236f
commit c2eaab4b44
6 changed files with 75 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gen/__init__.py
View file

@ -33,6 +33,13 @@ def initMasterValue(v):
else: res = v
return [str(v) for v in res]
# Default Appy indexes ---------------------------------------------------------
defaultIndexes = {
'State': 'FieldIndex', 'UID': 'FieldIndex', 'Title': 'ZCTextIndex',
'SortableTitle': 'FieldIndex', 'SearchableText': 'ZCTextIndex',
'Creator': 'FieldIndex', 'Created': 'DateIndex', 'ClassName': 'FieldIndex',
'Allowed': 'KeywordIndex'}
# Descriptor classes used for refining descriptions of elements in types
# (pages, groups,...) ----------------------------------------------------------
class Page:
@ -961,14 +968,17 @@ class Type:
try:
return method(obj, self)
except Exception, e:
# Log the initial error.
obj.log(tb, type='error')
if raiseOnError: raise te
else: return str(te)
if raiseOnError:
# Raise the initial error.
raise te
else:
obj.log(tb, type='error')
return str(te)
except Exception, e:
obj.log(Traceback.get(), type='error')
if raiseOnError: raise e
else: return str(e)
else:
obj.log(Traceback.get(), type='error')
return str(e)
def process(self, obj):
'''This method is a general hook allowing a field to perform some
@ -2122,7 +2132,7 @@ class Computed(Type):
return self.callMacro(obj, self.method)
else:
# self.method is a method that will return the field value
return self.callMethod(obj, self.method, raiseOnError=False)
return self.callMethod(obj, self.method, raiseOnError=True)
def getFormattedValue(self, obj, value):
if not isinstance(value, basestring): return str(value)