--- ECHO_content/ECHO_helpers.py 2005/02/07 19:40:37 1.41 +++ ECHO_content/ECHO_helpers.py 2005/03/07 20:05:38 1.45 @@ -12,7 +12,7 @@ import Globals from AccessControl import ClassSecurityInfo import os.path -displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ECHO_externalLink','ImageCollectionIFrame','VLP_resource','VLP_essay','ECHO_ZCatalogElement','ImageCollection','versionedFileFolder'] +displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ECHO_externalLink','ImageCollectionIFrame','VLP_resource','VLP_essay','ECHO_ZCatalogElement','ImageCollection','versionedFileFolder','ECHO_movie'] def content_html(self,type): """template fuer content""" @@ -25,7 +25,7 @@ def content_html(self,type): obj=getattr(self,type+"_template") return obj() else: - pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_%s_template_standard.zpt'%type).__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%type)).__of__(self) pt.content_type="text/html" return pt() @@ -395,8 +395,9 @@ def checkOnlyOneInGroup(object): return displayedObjects[0][1] else: return object -def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None): - +def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None): + + def sort(x,y): return cmp(x[0],y[0]) @@ -414,12 +415,24 @@ def getSubCols(self, sortfield=None, sub sortWithMD = lambda sortfield : (lambda x,y : sortfnc(sortfield,x,y)) ids=[] displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes) - + for entry in displayedObjects: - - object=entry[1] - ids.append(object) + + + object=entry[1] + if searchMD and hasattr(object,'getMDValue'): + flag=0 + for field in searchMD.keys(): + if object.getMDValue(field)==searchMD[field]: + flag=1 + else: + flag=0 + break + if flag==1: + ids.append(object) + else: + ids.append(object) if not sortfield: sortfield=getattr(self,'sortfield','weight') @@ -428,6 +441,7 @@ def getSubCols(self, sortfield=None, sub tmplist=[] for x in ids: + if hasattr(x,sortfield): try: tmp=int(getattr(x,sortfield))