--- ECHO_content/ECHO_collection.py 2004/10/27 14:23:24 1.182 +++ ECHO_content/ECHO_collection.py 2004/10/27 14:53:00 1.183 @@ -1022,10 +1022,16 @@ class ECHO_resource(Folder,Persistent): return "%sfn=%s&pn=%i"%(digiliburlprefix,resourcepath+"/"+images,pn) - def copyTitleToInfoXML(self): + def copyTitleToInfoXML(self,RESPONSE=None): """copy title from the resource""" presentationXML=readFieldFromXML(self.metalink,'texttool','presentation') resourcepath=readFieldFromXML(self.metalink,'resource','archive-path') + if (not presentationXML) or (not resourcepath): + if RESPONSE: + RESPONSE.write("Error: %s"%self.getId()) + else: + return None,self.getId() + print os.path.join(resourcepath,presentationXML) fh=file(os.path.join(resourcepath,presentationXML),'w') fh.write(""" @@ -1035,7 +1041,7 @@ class ECHO_resource(Folder,Persistent): yes """%self.title) fh.close() - + return 1,self.getId() def setStartPage(self,startpage=None,RESPONSE=None): """set start page, if no startpage defined use the generic one of the resource""" @@ -2213,17 +2219,26 @@ class ECHO_collection(Folder, Persistent if RESPONSE is not None: RESPONSE.redirect('manage_main') - def copyTitleToInfoXMLFolder(self): + def copyTitleToInfoXMLFolder(self,RESPONSE=None): """copy title into the title field of info.xml author and date werden leer!!! """ - resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1) + resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource','ECHO_collection']) + for resource in resources: - - resource[1].copyTitleToInfoXML() - + if resource[1].meta_type=="ECHO_collection": + + resource[1].copyTitleToInfoXMLFolder(RESPONSE) + else: + ret,txt=resource[1].copyTitleToInfoXML() + if (not ret) and RESPONSE: + RESPONSE.write("error: %s\n"%txt) + if ret and RESPONSE: + RESPONSE.write("ok: %s\n"%txt) + + zLOG.LOG("ECHO",zLOG.INFO,txt) if RESPONSE is not None: RESPONSE.redirect('manage_main')