--- ECHO_content/ECHO_helpers.py 2005/12/01 12:11:51 1.67 +++ ECHO_content/ECHO_helpers.py 2005/12/04 09:10:55 1.68 @@ -126,6 +126,10 @@ class ECHO_basis: return ret + def content_html_XMLRpc(self): + """xml_rpc_version""" + return encodeRPC(self.content_html()) + def content_html(self,type="collection"): """template fuer content bei einbau und ECHO_Umgebung""" @@ -542,6 +546,7 @@ def checkOnlyOneInGroup(object): return displayedObjects[0][1] else: return object + def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchSimple=None,generic="yes"): def sort(x,y): @@ -561,18 +566,11 @@ def getSubCols(self, sortfield=None, sub sortWithMD = lambda sortfield : (lambda x,y : sortfnc(sortfield,x,y)) ids=[] displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes) - - - if searchSimple and (not (searchSimple==""))and hasattr(self,'resourceCatalog'): - - searchString=" AND ".join(searchSimple.split()) - - ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString})] - + if searchSimple and (not (searchSimple==""))and hasattr(self,'resourceCatalog'): + searchString=" AND ".join(searchSimple.split()) + ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString})] else: - for entry in displayedObjects: - - + for entry in displayedObjects: object=entry[1] if searchMD and hasattr(object,'getMDValue'): flag=0 @@ -584,20 +582,13 @@ def getSubCols(self, sortfield=None, sub flag=0 break if flag==1: - ids.append(object) - - + ids.append(object) else: ids.append(object) - if not sortfield: sortfield=getattr(self,'sortfield','weight') - - tmplist=[] - for x in ids: - if hasattr(x,sortfield): try: tmp=int(getattr(x,sortfield))