--- MPIWGWeb/MPIWGStaff.py 2008/08/20 12:24:29 1.10.2.44 +++ MPIWGWeb/MPIWGStaff.py 2008/09/12 12:28:48 1.10.2.60 @@ -13,13 +13,18 @@ from Products.versionedFile.extVersioned import os import logging import bibliography +import email from Globals import package_home from Products.PythonScripts.standard import sql_quote from types import * from AccessControl import ClassSecurityInfo - +import time import logging +import email +import re +from OFS.Cache import Cacheable +from MPIWGHelper import * #ersetzt logging def logger(txt,method,txt2): """logging""" @@ -52,8 +57,8 @@ def createNewDBEntry(self,publish_the_da return False,"ERROR:key%s already exists"%key #eintragen - columnlist="""publish_the_data,key,last_name,first_name,title,status,e_mail,e_mail_p,date_from,date_to,department,home_inst,funded_by,e_mail2,date_stay_at_mpiwg,web_object_created,"group" """ - insertTuple=(publish_the_data,key,name,vorname,title,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg,web_object_created,group) + columnlist="""publish_the_data,key,last_name,first_name,title,status,e_mail,e_mail_p,date_from,date_to,department,home_inst,funded_by,e_mail2,date_stay_at_mpiwg,web_object_created,"group",current_work,current_work_p """ + insertTuple=(publish_the_data,key,name,vorname,title,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg,web_object_created,group,current_work,"yes") insert=[] for element in insertTuple: @@ -68,13 +73,13 @@ def createNewDBEntry(self,publish_the_da self.ZSQLQuery(queryStr) logging.info("QQQQ %s:"%queryStr) #currentwork - if not (current_work==""): - queryStr="INSERT INTO current_work (key_main,current,publish) VALUES ('%s',%s,'%s')"%(key,self.ZSQLQuote(current_work),"yes") + #if not (current_work==""): + # queryStr="INSERT INTO current_work (key_main,current,publish) VALUES ('%s',%s,'%s')"%(key,self.ZSQLQuote(current_work),"yes") - self.ZSQLQuery(queryStr) + # self.ZSQLQuery(queryStr) return True,msg -class MPIWGStaff(CatalogAware,ZSQLExtendFolder): +class MPIWGStaff(CatalogAware,ZSQLExtendFolder,Cacheable): """Staff""" meta_type="MPIWGStaff" @@ -82,12 +87,33 @@ class MPIWGStaff(CatalogAware,ZSQLExtend departmentList=departmentList security=ClassSecurityInfo() + def redirect(self,RESPONSE,url): + """mache ein redirect mit einem angehaengten time stamp um ein reload zu erzwingen""" + + timeStamp=time.time() + + if url.find("?")>-1: #giebt es schon parameter + addStr="&time=%s" + else: + addStr="?time=%s" + + RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT') + logging.error(email.Utils.formatdate()+' GMT') + RESPONSE.redirect(url+addStr%timeStamp) + + def getKeyUTF8(self): + """get db_key utf8""" + return utf8ify(self.getKey()) + def getKey(self): """get database key""" if hasattr(self,'key'): - return self.key.lower() + #logging.error("SAVED KEY:%s"%self.key) + return unicodify(self.key.lower()) + #return self.key.lower() #fuer alt faelle ohne key + #logging.error("NEW KEY:%s"%(self.firstName+'_'+self.lastName).lower().replace(' ','')) return (self.firstName+'_'+self.lastName).lower().replace(' ','') def getConnectionObj(self):#ueberschreibe connection id methode @@ -138,7 +164,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.publicationSelectionMode=publicationSelectionMode if RESPONSE: - RESPONSE.redirect("editPublications") + self.redirect(RESPONSE,"editPublications") def downloadCV(self,RESPONSE): @@ -201,8 +227,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend cvFile.addContentObject("","",file=publications_pdf) if RESPONSE: - RESPONSE.redirect(self.REQUEST['HTTP_REFERER']) - + self.redirect(RESPONSE,self.REQUEST['HTTP_REFERER']) + def getPublishImage(self): """publish the image??, default no""" @@ -229,7 +255,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.publishImage=publishImage if RESPONSE: - RESPONSE.redirect("edit") + self.redirect(RESPONSE,"edit") def getImageFolder(self): """getImageFolder""" @@ -288,11 +314,32 @@ class MPIWGStaff(CatalogAware,ZSQLExtend """ return self.id - def harvest_page(self): + def harvest_page_old(self,context=None): """geharvestete seite = verschlankte version von members_main""" - pt = getTemplate(self, "harvest_members_main") + #pt = getTemplate(self, "harvest_members_main") + + if not self.isPublished(): + return "" + if not context: + context=self + + + ext=getattr(self,"harvest_members_main",None) + if ext: + return getattr(self,ext.getId())() + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','harvest_members_main')).__of__(context) + + return pt() + def harvest_page(self): + """harvest""" + if not self.isPublished(): + return "" + return getattr(self.en.staff.members,self.getId()).index_html() + + def index_html(self): """show homepage""" pt = getTemplate(self, "members_main") @@ -314,7 +361,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.specialPublicationsField=specialPublicationsField[0:] if RESPONSE is not None: - RESPONSE.redirect('manage_main') + self.redirect(RESPONSE,'manage_main') def publications_full(self): @@ -347,7 +394,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.key = key if RESPONSE is not None: - RESPONSE.redirect('manage_main') + self.redirect(RESPONSE,'manage_main') security.declareProtected('View management screens','edit') def edit(self): @@ -359,9 +406,13 @@ class MPIWGStaff(CatalogAware,ZSQLExtend # self.REQUEST.RESPONSE.redirect(redURL) pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self) + + + logging.error("XX:"+email.Utils.formatdate().split("-")[0]+'GMT') return pt() mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt')) + addPublicationsBib=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addPublicationsBib.zpt')) def getPathStyle(self, path, selected, style=""): """returns a string with the given style + 'sel' if path == selected.""" @@ -372,7 +423,34 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return style - def changeCurrentWork(self,current_work,publish,key,RESPONSE=None): + def getLabel(self): + """returns a label for this object""" + return self.title + + def getBreadcrumbs(self): + """return list of breadcrumbs from here to the root""" + crumbs = [] + # skip direct parent Folder /members/ + parent = self.aq_parent.aq_parent + # get parents breadcrumbs + logging.debug("getbreadcrumbs-: title=%s self=%s parent=%s"%(self.title, repr(self), repr(parent))) + if hasattr(parent, 'getBreadcrumbs'): + logging.debug("getbreadcrumbs: recurse to %s"%parent) + crumbs = parent.getBreadcrumbs() + + # try to get acquisition URL from parent + if hasattr(parent, 'absolute_url'): + baseUrl = "%s/%s/"%(parent.absolute_url(), 'members') + else: + baseUrl = "/en/staff/members/" + + # add this + crumbs.append((self.getLabel(), baseUrl+self.getId(), self)) + + return crumbs + + + def changeCurrentWork(self,current_work,key,publish="yes",RESPONSE=None): """change current work""" query="UPDATE personal_www SET current_work =%s WHERE key='%s'" @@ -384,10 +462,10 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.ZSQLQuery(query%(self.ZSQLQuote(publish),key)) if RESPONSE: - RESPONSE.redirect("edit") + self.redirect(RESPONSE,"edit") security.declareProtected('View management screens','changeResearch') - def changeResearch(self,noredirect=None): + def changeResearch(self,noredirect=None,RESPONSE=None): """change the research entries""" newEntries={} key_main=self.REQUEST.form['key_main'] @@ -436,7 +514,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.ZSQLQuery(query) if not noredirect: - self.REQUEST.RESPONSE.redirect(self.REQUEST['HTTP_REFERER']) + self.redirect(RESPONSE,self.REQUEST['HTTP_REFERER']) security.declareProtected('View management screens','editCV') def editCV(self,cv=None,oid=None,RESPONSE=None): @@ -451,11 +529,13 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.ZSQLQuery(query%(self.ZSQLQuote(cv),oid)) if RESPONSE: - RESPONSE.redirect("editCV") + self.redirect(RESPONSE,"editCV") def getProfile(self): """get the profile""" + self.REQUEST.RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT') + founds=self.ZSQLInlineSearchU(_table='personal_www',key=self.getKey()) html="""%s""" if founds.profile and founds.profile != "": @@ -492,7 +572,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if preview: #TODO: not supported yet if RESPONSE: - RESPONSE.redirect("editProfile") + self.redirect(RESPONSE,"editProfile") #return self.preview(newcontent) @@ -500,7 +580,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.ZSQLQuery(query%(self.ZSQLQuote(newcontent),oid)) logging.error("PROFILE:"+query%(self.ZSQLQuote(newcontent),oid)) if RESPONSE: - RESPONSE.redirect("editProfile") + self.redirect(RESPONSE,"editProfile") @@ -510,18 +590,18 @@ class MPIWGStaff(CatalogAware,ZSQLExtend ret="" founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.key) if founds: - ret="Research interests:

" + ret="

Research interests:


" for found in self.sortPriority(founds): ret+=found.interest+"
" - founds=self.ZSQLInlineSearch(_table='current_work',key_main=person.key) - if founds: - ret="Current work:

" - for found in self.sortPriority(founds): - ret+=found.current+"
" - - ret+="
" - ret+=self.formatAscii(person.cv) + + if (person.current_work) and (not person.current_work==""): + ret+="

Current work:


" + + ret+=person.current_work+"
" + if (person.cv) and (not person.cv==""): + ret+="

Curriculum Vitae:


" + ret+=self.formatAscii(person.cv) return ret security.declareProtected('View management screens','editDownloads') @@ -531,6 +611,14 @@ class MPIWGStaff(CatalogAware,ZSQLExtend pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editDownloads.zpt')).__of__(self) return pt() + security.declareProtected('View management screens','editAdditionalLinks.zpt') + def editAdditionalLinks(self): + """editiere die Downloads von der Webseite""" + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editAdditionalLinks.zpt')).__of__(self) + return pt() + + security.declareProtected('View management screens','editAwards') def editAwards(self,awards=None,oid=None,RESPONSE=None): """edit a awards""" @@ -544,7 +632,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.ZSQLQuery(query%(self.ZSQLQuote(awards),oid)) if RESPONSE: - RESPONSE.redirect("editAwards") + self.redirect(RESPONSE,"editAwards") security.declareProtected('View management screens','editTalks') def editTalks(self): @@ -578,7 +666,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend else: self.ZSQLChange(argv,_table="personal_www",_identify="key=%s"%self.getKey(),USE_FORM="yes") if RESPONSE: - RESPONSE.redirect("editMainData") + self.redirect(RESPONSE,"editMainData") security.declareProtected('View management screens','newBibliogrpaphy') def newBibliography(self,_docType=None, _addEntry=None,RESPONSE=None,**argv): @@ -608,7 +696,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if RESPONSE: - RESPONSE.redirect("editPublications") + self.redirect(RESPONSE,"editPublications") return True @@ -637,7 +725,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.sortingMode=sortingMode if RESPONSE and REQUEST: - REQUEST.RESPONSE.redirect(REQUEST['HTTP_REFERER']) + self.redirect(RESPONSE,REQUEST['HTTP_REFERER']) return True @@ -656,16 +744,17 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return 0 security.declareProtected('View management screens','changePublications') - def changePublications(self): + def changePublications(self,RESPONSE=None): """change the publication list""" self.changeResearch(noredirect=True) #self.updatePublicationDB(personId=self.getDBId()) - self.REQUEST.RESPONSE.redirect(self.REQUEST['HTTP_REFERER']) + self.redirect(RESPONSE,self.REQUEST['HTTP_REFERER']) + security.declareProtected('View management screens','addPublications') - def addPublications(self,submit=None,REQUEST=None,noredirect=None): + def addPublications(self,submit=None,REQUEST=None,noredirect=None,RESPONSE=None): """add publications""" #setzte flag ob aufruf aus suchformular @@ -697,7 +786,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if not noredirect: - self.REQUEST.RESPONSE.redirect("./editPublications") + self.redirect(RESPONSE,"./editPublications") return True @@ -778,12 +867,12 @@ class MPIWGStaff(CatalogAware,ZSQLExtend tmp.sort(sort) return tmp - def deleteField(self,table,oid): + def deleteField(self,table,oid,RESPONSE=None): """delete entry""" query="DELETE FROM %s WHERE oid = '%s'"%(table,oid) self.ZSQLQuery(query) - self.REQUEST.RESPONSE.redirect(self.REQUEST['HTTP_REFERER']) + self.redirect(RESPONSE,self.REQUEST['HTTP_REFERER']) def manage_addMPIWGStaffForm(self): @@ -799,6 +888,6 @@ def manage_addMPIWGStaff(self,id,lastNam if RESPONSE is not None: - RESPONSE.redirect('manage_main') + self.redirect(RESPONSE,'manage_main')