--- ECHO_content/ECHO_helpers.py 2005/10/10 10:05:06 1.61 +++ ECHO_content/ECHO_helpers.py 2005/11/03 14:45:28 1.64 @@ -408,7 +408,7 @@ class ECHO_basis: if hasattr(getattr(self,link),'link'): cLink=getattr(self,link).link # if existing delete virtuell path - if self.REQUEST.hasattr('VirtualRootPhysicalPath'): + if hasattr(self.REQUEST,'VirtualRootPhysicalPath'): cLink=cLink.replace('/'.join(self.REQUEST['VirtualRootPhysicalPath']),'') if backLink and hasattr(getattr(self,link),'link') and backLink==self.REQUEST['SERVER_URL']+cLink.lstrip(): @@ -531,19 +531,18 @@ def checkOnlyOneInGroup(object): return displayedObjects[0][1] else: return object -def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None): - +def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,generic="yes"): def sort(x,y): return cmp(x[0],y[0]) def sortfnc(sortfield,x,y): try: - xa=x[1].getMDValue(sortfield) + xa=x[1].getMDValue(sortfield,generic=generic) except: xa="" try: - ya=y[1].getMDValue(sortfield) + ya=y[1].getMDValue(sortfield,generic=generic) except: ya="" return cmp(xa,ya) @@ -553,6 +552,7 @@ def getSubCols(self, sortfield=None, sub displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes) + for entry in displayedObjects: @@ -560,7 +560,7 @@ def getSubCols(self, sortfield=None, sub if searchMD and hasattr(object,'getMDValue'): flag=0 for field in searchMD.keys(): - if object.getMDValue(field)==searchMD[field]: + if object.getMDValue(field,generic=generic)==searchMD[field]: flag=1 else: flag=0 @@ -608,7 +608,7 @@ def ECHO_rerenderLinksMD(self,obj=None,t for entry in entries: if entry[1].meta_type == 'ECHO_resource': try: - entry[1].ECHO_getResourceMD(template="no") + entry[1].ECHO_getResourceMD(template="no",overwrite="yes") if "title" in types: entry[1].generate_title() if "label" in types: @@ -626,14 +626,20 @@ def reloadMetaDataFromStorage(self,RESPO """copy metadata from the storage to ECHO""" ret="" resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1) - + if RESPONSE is not None: + RESPONSE.setHeader("Content-Type", type) + RESPONSE.write("\n") + for resource in resources: x=str(resource[1].copyIndex_meta2echo_resource())+"
" + if RESPONSE is not None: + RESPONSE.write(x+"\n") + ret+=x if RESPONSE is not None: #RESPONSE.redirect('./manage_main') - return ""+ret+"" + RESPONSE.write( "") return ret @@ -737,7 +743,7 @@ def checkDiffs(self,metadict): for field in tags[1]: try: - if (NoneToEmpty(self.getFieldValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]): + if (NoneToEmpty(self.getMDValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]): diffs[self.getFieldTag(tags,field)]=1 else: