--- MPIWGWeb/MPIWGProjects.py 2010/09/13 11:23:58 1.47.2.117 +++ MPIWGWeb/MPIWGProjects.py 2009/02/18 13:01:17 1.48 @@ -25,7 +25,6 @@ from AccessControl import getSecurityMan from bibliography import * import time from OFS.Cache import Cacheable -import xmlrpclib #import xml.dom.minidom import sys #from Ft.Xml.XPath import Evaluate @@ -73,42 +72,7 @@ class MPIWGProject_publication(Folder): logging.debug(email.Utils.formatdate()+' GMT') RESPONSE.redirect(url+addStr%timeStamp) - def hasLinkToBookPage(self): - """teste ob eingebener link zu einer MPIWG Book page geht""" - - if (getattr(self,'link','')==''): - return False #es gibt keinen link - - server = xmlrpclib.ServerProxy(self.link) - - try: - server.getImageUrls() - return True - except: - return False - - - def getImageUrls(self): - """get the image urls""" - - if (getattr(self,'link','')==''): - return False #es gibt keinen link - - server = xmlrpclib.ServerProxy(self.link) - - try: - urls = server.getImageUrls() - ret=[] - for url in urls: - url = os.path.join(self.link,url) - ret.append(url) - - except: - return [] - - return ret - - def editPublication(self,text=None,image1=None,image2=None,description=None,link=None,RESPONSE=None): + def editPublication(self,text=None,image1=None,image2=None,description=None,RESPONSE=None): """edit a publication""" if (not text) and (not description): @@ -116,14 +80,8 @@ class MPIWGProject_publication(Folder): return pt() - if text: - self.text=text[0:] - - if description: - self.description=description - - if link: - self.link=link[0:] + self.text=text[0:] + self.description=description if image1: if hasattr(self,'publicationImage1'): @@ -141,7 +99,7 @@ class MPIWGProject_publication(Folder): if RESPONSE: - self.redirect(RESPONSE,"../managePublications") + self.redirect(RESPONSE,"../managePublications") class MPIWGProject_image(Image): """Images for Projects""" @@ -167,13 +125,12 @@ class MPIWGProject_image(Image): self.caption=caption[0:] if RESPONSE: + self.redirect(RESPONSE,"../manageImages") class MPIWGProject(CatalogAware,Folder,Cacheable): """Class for Projects""" - - def _p_resolveConflict(self, oldState, savedState, newState): - return newState + security=ClassSecurityInfo() meta_type='MPIWGProject' @@ -219,45 +176,10 @@ class MPIWGProject(CatalogAware,Folder,C pubSplit=pubSplit.replace("

","") self.addPublication(pubSplit) - setattr(self,"WEB_related_pub_copied",True); - if RESPONSE: - + self.redirect(RESPONSE,'managePublications') - def hasRelatedPublicationsOldVersion(self): - """teste ob es related publications gibt""" - - ret = True; - if (self.getContent('WEB_related_pub')==''): - ret=False; #nichts im alten feld - logging.debug("webrel:"+repr(ret)) - if (getattr(self,'WEB_related_pub_copied',False)): - ret=False; # alte daten sind schon kopiert worden - - logging.debug("webrel_copied:"+repr(ret)) - publications=self.ZopeFind(self,obj_metatypes=['MPIWGProject_publication']); - - if(len(publications)>0): - ret=False; # es gibt publicationen in der neuen liste - - - logging.debug("len(publ)"+repr(ret)) - - return ret; - - def hasRelatedDigitalSources(self): - """test ob es digital sources gibt""" - - - ret = (self.getContent('xdata_11')=='' and self.getContent('xdata_13')=='') - - - - return not ret; - - - def copyImageToMargin(self,RESPONSE=None): """copy inline images to marginal images""" @@ -325,7 +247,7 @@ class MPIWGProject(CatalogAware,Folder,C obj.update_data(data) if RESPONSE: - + self.redirect(RESPONSE,'manageImages') def manageImages(self,imageName=None,op=None): @@ -405,7 +327,7 @@ class MPIWGProject(CatalogAware,Folder,C if RESPONSE: - self.redirect(RESPONSE,"managePublications") + self.redirect(RESPONSE,"managePublications") def getPublications(self): @@ -433,7 +355,7 @@ class MPIWGProject(CatalogAware,Folder,C obj.id=name if RESPONSE is not None: - + self.redirect(RESPONSE,'managePublications') @@ -449,7 +371,7 @@ class MPIWGProject(CatalogAware,Folder,C """delete Publication id""" self.manage_delObjects([id]) if RESPONSE: - + self.redirect(RESPONSE,'managePublications') def getImages(self): @@ -487,7 +409,7 @@ class MPIWGProject(CatalogAware,Folder,C except: logging.error("ERROR MPIWG: %s %s"%sys.exc_info()[0:2]) if RESPONSE: - self.redirect(RESPONSE,'manageImages') + self.redirect(RESPONSE,'manageImages') @@ -594,31 +516,20 @@ class MPIWGProject(CatalogAware,Folder,C def copyObjectToArchive(self): """kopiere aktuelles objekt ins archiv""" - logging.info("copytoarchive 1") cb=self.aq_parent.manage_copyObjects(self.getId()) - logging.info("copytoarchive 2") self.manage_pasteObjects(cb) - logging.info("copytoarchive 3") actualTime=time.localtime() self.manage_renameObject(self.getId(),self.getId()+"_"+time.strftime("%Y%m%d%H%M%S",actualTime)) - logging.info("copytoarchive 4") obj=getattr(self,self.getId()+"_"+time.strftime("%Y%m%d%H%M%S",actualTime)) obj.setArchiveTime(time.strftime("%Y%m%d%H%M%S",actualTime)) - logging.info("copytoarchive 5") ids=[x[0] for x in self.ZopeFind(obj,obj_metatypes=['MPIWGProject'])] - logging.info("copytoarchive 6") obj.manage_delObjects(ids) - logging.info("copytoarchive 7") def setArchiveTime(self,time): """set Archive Time""" self.archiveTime=time[0:] - def delArchiveTime(self): - """delete archive time""" - del self.archiveTime - def versionManageForm(self): """version Manage form:currently only set to invisible""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_versionManageForm.zpt')).__of__(self) @@ -629,7 +540,7 @@ class MPIWGProject(CatalogAware,Folder,C self.invisible=invisible if RESPONSE is not None: - + self.redirect(RESPONSE,'manage_main') @@ -751,16 +662,16 @@ class MPIWGProject(CatalogAware,Folder,C else: return "" # test ob parent abgeschlossen ist - try: #TODO: ersetzte try except durch vernuenftige abfrage + try: #TODO: ersetzte try except durch vernuenftige abfrage ct=self.getContexts(parents=self.getContent('xdata_05'),depth=1) if (len(ct)>0): #is there are parent return ct[0][0].getCompletedAt() return ''; - except: + except: return ''; def getStartedAt(self): - """gibt das transformierte Datum zurueck, an dem Projekt begonnen wurde.""" + """gibt das transformierte Datum zurŸck, an dem Projekt begonnen wurde.""" date=getattr(self,'startedAt','') if date: return self.reTransformDate(date); @@ -781,8 +692,8 @@ class MPIWGProject(CatalogAware,Folder,C def transformDate(self,date): - """transformiert ein Datum von DD.MM.YYYY, MM.YYYY,YYYY nach YYYYMMDD, alle nicht angebenen Werte - werden auf 0 gesetzt, es wird null zurueckgegeben falls das Datum ungueltig ist""" + """transformiert ein Datum von DD.MM.YYYY, MM.YYYY,YYYY nach YYYYMMDD, alle nicht angebebenn Werte + werden auf 0 gesetzt, es wird null zurŸckgegeben falls das Datum ungueltig ist""" if (date==None): return None; @@ -905,6 +816,7 @@ class MPIWGProject(CatalogAware,Folder,C security = getSecurityManager() bound_names['user'] = security.getUser() + # Retrieve the value from the cache. keyset = None @@ -924,9 +836,7 @@ class MPIWGProject(CatalogAware,Folder,C security.addContext(self) try: - #logging.debug("index_html pt=%s"%repr(pt)) result = pt.pt_render(extra_context=bound_names) - #logging.debug("index_html result=%s"%repr(result)) if keyset is not None: # Store the result in the cache. self.ZCacheable_set(result, keywords=keyset) @@ -978,13 +888,12 @@ class MPIWGProject(CatalogAware,Folder,C def getContent(self,field,filter=None): """Inhalt des Feldes""" - #logging.debug("getContent field=%s filter=%s"%(field,filter)) - if field=="short_title": - text = self.getContent("xdata_07") - if text=="": - text = self.getContent("WEB_title") - return text + if field=="short_title": + text = self.getContent("xdata_07") + if text=="": + text = self.getContent("WEB_title") + return text text=u'' @@ -1088,7 +997,6 @@ class MPIWGProject(CatalogAware,Folder,C def saveEditedContent(self,kupu=None,preview=None): """save Edited content""" - #logging.debug("saveEditedContent kupu=%s preview=%s"%(kupu,preview)) if preview: kupu=preview @@ -1098,6 +1006,7 @@ class MPIWGProject(CatalogAware,Folder,C newcontent= kupu[start+6:end] if preview: + return self.preview(newcontent) self.copyObjectToArchive() @@ -1179,7 +1088,6 @@ class MPIWGProject(CatalogAware,Folder,C def preview(self,description): """preview""" - #logging.debug("preview description=%s"%description) tmpPro=getattr(self,"previewTemplate",None) if not tmpPro: tmpPro=MPIWGProject("previewTemplate") @@ -1188,7 +1096,7 @@ class MPIWGProject(CatalogAware,Folder,C setattr(tmpPro,field,getattr(self,field)) tmpPro.WEB_project_description=description[0:] tmpPro.invisible=True - pt=PageTemplateFile('zpt/previewFrame.zpt',globals()).__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','previewFrame.zpt')).__of__(self) return pt() #return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+"/previewTemplate") @@ -1196,7 +1104,7 @@ class MPIWGProject(CatalogAware,Folder,C def getWebProject_description(self): """get description""" - debug = self.REQUEST.cookies.get("MP_debug_code",None) + debug= self.REQUEST.cookies.get("MP_debug_code",None) if debug and debug=="western": return """ @@ -1204,8 +1112,8 @@ class MPIWGProject(CatalogAware,Folder,C - %s - + %s + """%self.WEB_project_description[0] return """ @@ -1213,8 +1121,8 @@ class MPIWGProject(CatalogAware,Folder,C - %s - + %s + """%self.getContent('WEB_project_description') @@ -1239,7 +1147,7 @@ class MPIWGProject(CatalogAware,Folder,C return False def getPersonKeyList(self): - """gibt die key Liste der beteiligten Personen zurueck (utf8 codiert)""" + """gibt die key Liste der beteiligten Personen zurŸck (utf8 codiert)""" #logging.error("getPersonKeyList:%s"%getattr(self,'responsibleScientistsList',[])) try: return [utf8ify(x[1]) for x in getattr(self,'responsibleScientistsList',[])] @@ -1261,9 +1169,9 @@ class MPIWGProject(CatalogAware,Folder,C else: names=nameList.split(",") - self._v_names=[] - for name in names: - self._v_names.append(name.rstrip().lstrip()) + self._v_names=[] + for name in names: + self._v_names.append(name.rstrip().lstrip()) def sort(x,y):