--- MPIWGWeb/MPIWGStaff.py 2005/10/12 19:35:38 1.10.2.5 +++ MPIWGWeb/MPIWGStaff.py 2007/04/25 22:33:51 1.10.2.34 @@ -9,10 +9,19 @@ from Products.PageTemplates.PageTemplate from Products.PageTemplates.PageTemplate import PageTemplate from Products.ZCatalog.CatalogPathAwareness import CatalogAware import os +import logging import bibliography from Globals import package_home from Products.PythonScripts.standard import sql_quote from types import * +from AccessControl import ClassSecurityInfo + +import logging + +#ersetzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek" @@ -27,38 +36,96 @@ def getTemplate(self, tpName): assert(pt) return pt -class MPIWGStaff(CatalogAware,ZSQLExtendFolder): - """Staff""" - - meta_type="MPIWGStaff" - default_catalog='MembersCatalog' - departmentList=departmentList - - def createNewDBEntry(self,publish_the_data,id,name,vorname,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by="",e_mail2="",txt="",txt_p="no"): +def createNewDBEntry(self,publish_the_data,key,name,vorname,title,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by="",e_mail2="",txt="",txt_p="no",stay_at_mpiwg="",group="",web_object_created="no",current_work=""): """lege person in der datenbank an""" + + if date_to=="": # wenn date_to leer + date_to="date_none" + if date_from=="": # wenn date_fromleer + date_from="date_none" + msg="" #test ob id schon existiert - if self.ZSQLQuery("select id from personal_www where id='%s'"%id): - return False,"id %s already exists"%id + if self.ZSQLQuery("select key from personal_www where key='%s'"%id): + return False,"ERROR:key%s already exists"%key #eintragen - columnlist="publish_the_data,id,name,vorname,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2" - insertTuple=(publish_the_data,id,name,vorname,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2) + 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) insert=[] for element in insertTuple: - insert.append("'%s'"%element) - + if element=="date_none": # date_none eintrag wird zu null uebersetzt + insert.append('null') + else: + insert.append("%s"%self.ZSQLQuote(element)) + insertStr=",".join(insert) - queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertTuple) - + queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr) + self.ZSQLQuery("SET DATESTYLE TO 'German'") self.ZSQLQuery(queryStr) - + logging.error("QQQQ %s:"%queryStr) #currentwork - if not (txt==""): - queryStr="INSERT INTO current_work (id_main,current,publish) VALUES ('%s','%s','%s')"%(id,txt,txt_p) + 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) + + return True,msg +class MPIWGStaff(CatalogAware,ZSQLExtendFolder): + """Staff""" + + meta_type="MPIWGStaff" + default_catalog='MembersCatalog' + departmentList=departmentList + security=ClassSecurityInfo() + + def getKey(self): + """get database key""" + if hasattr(self,'key'): + return self.key.lower() + + #fuer alt faelle ohne key + return (self.firstName+'_'+self.lastName).lower().replace(' ','') + + def getConnectionObj(self):#ueberschreibe connection id methode + return getattr(self.de,self.de.connection_id) + + def isPublished(self): + """gib publications status aus der datenbank aus""" + key=self.getKey() + query="select count(publish_the_data) from personal_www where key='%s' and publish_the_data='yes'"%key + + res = self.ZSQLQuery(query) + + if res and res[0].count>0: + return True + else: + return False + + + + def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg="",position="",abteilung=""): + """zpddatedb""" + if not DBid: + DBid=self.getDBId() + + + self.ZSQLQuery("SET DATESTYLE TO 'German'") + + test=self.ZSQLQuery("select id from personal_www where id='%s' "%DBid) + + + if test and (len(test)>0): #dataset exists + logger("MPIWG Web",logging.INFO,'UPDATE: _table="personal_www",_identify="id=%s"'%DBid+',publish_the_data=%s'%publish_the_data+',date_from=%s'%date_from+',date_to=%s'%date_to+',stay_at_mpiwg=%s'%stay_at_mpiwg+',position=%s'%position) + self.ZSQLChange(_table="personal_www",_identify="id=%s"%DBid,publish_the_data=publish_the_data, + date_from=date_from, + date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position,abteilung=abteilung) + return True + else: + return False + def getPublicationSelectionMode(self): """get publication selection mode, default 'priority'""" return getattr(self,'publicationSelectionMode','priority') @@ -78,11 +145,20 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def updateImage(self,file,publishImage,rename=None,RESPONSE=None): """update image""" - - if self.getImageObj(): - self.getImageObj().updateImage(file,rename=None,RESPONSE=None) - else: - self.getImageFolder().addImage2(file,fileName=self.getId()) + + if file and not(file.filename==""): + if self.getImageObj(): + self.getImageObj().updateImage(file,_rename=None,RESPONSE=None) + else: + # create new image object + xp = file.filename.rfind('.') + if xp > 0: + ext = file.filename[xp:] + fn = self.getId()+ext + logger("MPWIG STAFF", logging.INFO, "new filename: %s"%fn) + self.getImageFolder().addImage2(file,fileName=fn) + else: + logger("MPWIG STAFF", logging.ERROR, "uploaded filename %s has no extension!"%file.filename) self.publishImage=publishImage @@ -91,12 +167,20 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getImageFolder(self): """getImageFolder""" - return self.getPhysicalRoot().www_neu.images.staff_images - + #TODO: make place of staff image folder configurable + + try: + return self.getPhysicalRoot().www_neu.images.staff_images + except: + logger("MPWIG STAFF", logging.ERROR, "image folder not found:"," has to be add /www_neu/staff_images") + return None + def getImageObj(self): """getImage""" imageFolder=self.getImageFolder() + if not imageFolder: return None + image=getattr(imageFolder,self.getId(),None) if not image: @@ -124,13 +208,18 @@ class MPIWGStaff(CatalogAware,ZSQLExtend {'label':'Change Publications Special','action':'changePublications_specialForm'}, ) - def __init__(self,id, lastName,firstName): + def __init__(self,id, lastName,firstName,key): """init""" self.id=id - self.title="%s, %s"%(lastName,firstName) + self.title=key self.lastName=lastName self.firstName=firstName + self.key=key + def harvest_page(self): + """geharvestete seite = verschlankte version von members_main""" + pt = getTemplate(self, "harvest_members_main") + return pt() def index_html(self): """show homepage""" @@ -175,7 +264,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend """change form""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGStaff.zpt')).__of__(self) return pt() - + + security.declareProtected('View management screens','changeMPIWGStaff') def changeMPIWGStaff(self,lastName,firstName,RESPONSE=None): """change it""" self.title="%s, %s"%(lastName,firstName) @@ -184,19 +274,34 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if RESPONSE is not None: RESPONSE.redirect('manage_main') - + + security.declareProtected('View management screens','edit') def edit(self): """Edit the pages""" + #TODO: zusammenspiel mit apache, redirect auf 18080 rausnehmen bzw. zumindest verallgemeinern + #if self.REQUEST['SERVER_URL']=="http://www.mpiwg-berlin.mpg.de": + # redURL="http://xserve04.mpiwg-berlin.mpg.de:18080/www_neu/de/mitarbeiter/members/%s/edit"%self.getId() + # + # self.REQUEST.RESPONSE.redirect(redURL) pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self) return pt() mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt')) + def getPathStyle(self, path, selected, style=""): + """returns a string with the given style + 'sel' if path == selected.""" + + if path == selected: + return style + 'sel' + else: + return style + + security.declareProtected('View management screens','changeResearch') def changeResearch(self,noredirect=None): """change the research entries""" newEntries={} - id_main=self.REQUEST.form['id_main'] + key_main=self.REQUEST.form['key_main'] mainfieldL=self.REQUEST.form['main_fields'].split(",") mainfield={} @@ -225,11 +330,11 @@ class MPIWGStaff(CatalogAware,ZSQLExtend #new entries for newEntry in newEntries.keys(): query="INSERT INTO %s "%newEntry - keys=['id_main'] - values=["'"+id_main+"'"] + keys=['key_main'] + values=["'"+sql_quote(key_main)+"'"] for key in newEntries[newEntry].keys(): keys.append(key) - values.append("'"+newEntries[newEntry][key]+"'") + values.append("'"+sql_quote(newEntries[newEntry][key])+"'") keystring=",".join(keys) @@ -243,42 +348,45 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if not noredirect: self.REQUEST.RESPONSE.redirect(self.REQUEST['HTTP_REFERER']) - + + security.declareProtected('View management screens','editCV') def editCV(self,cv=None,oid=None,RESPONSE=None): """edit Cv""" - if (not cv): + if (not oid): pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editCV.zpt')).__of__(self) return pt() - query="UPDATE personal_www SET cv ='%s' WHERE oid='%s'" - - self.ZSQLQuery(query%(cv,oid)) + query="UPDATE personal_www SET cv =%s WHERE oid='%s'" + + self.ZSQLQuery(query%(self.ZSQLQuote(cv),oid)) if RESPONSE: RESPONSE.redirect("editCV") + security.declareProtected('View management screens','editAwards') def editAwards(self,awards=None,oid=None,RESPONSE=None): """edit a awards""" - - if (not awards): + + if (not oid): pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editAwards.zpt')).__of__(self) return pt() - query="UPDATE personal_www SET awards ='%s' WHERE oid='%s'" - - self.ZSQLQuery(query%(awards,oid)) + query="UPDATE personal_www SET awards =%s WHERE oid='%s'" + + self.ZSQLQuery(query%(self.ZSQLQuote(awards),oid)) if RESPONSE: RESPONSE.redirect("editAwards") + security.declareProtected('View management screens','editTalks') def editTalks(self): """edit talks""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editTalks.zpt')).__of__(self) return pt() - + security.declareProtected('View management screens','editTeaching') def editTeaching(self): """edit Teaching""" @@ -291,20 +399,21 @@ class MPIWGStaff(CatalogAware,ZSQLExtend list= [x[0] for x in finds] return "\n".join(list) - def editMainData(self,REQUEST=None,RESPONSE=None,name=None,**argv): + security.declareProtected('View management screens','editMainData') + def editMainData(self,REQUEST=None,RESPONSE=None): """edit main data""" - - if not name: + argv=REQUEST.form + + if not argv.has_key('last_name'): pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self) return pt() else: - - self.ZSQLChange(argv,_table="personal_www",_identify="id=%s"%self.getDBId(),USE_FORM="yes") + self.ZSQLChange(argv,_table="personal_www",_identify="key=%s"%self.getKey(),USE_FORM="yes") if RESPONSE: RESPONSE.redirect("editMainData") - + security.declareProtected('View management screens','newBibliogrpaphy') def newBibliography(self,_docType=None, _addEntry=None,RESPONSE=None,**argv): """add an entry to the bibliography""" @@ -326,7 +435,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend bookId="b%06i" % newId self.ZSQLAdd(argv,_table="bibliography",reference_type=_docType,id=bookId) - self.ZSQLAdd(_table="publications",id_gen_bib=bookId,id_main=self.getDBId(),publish='yes') + self.ZSQLAdd(_table="publications",id_gen_bib=bookId,key_main=self.getDBId(),publish='yes') self.updatePublicationDB(personId=self.getDBId()) @@ -335,18 +444,20 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return True + security.declareProtected('View management screens','editImage') def editImage(self): """edit images""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editImageStaff.zpt')).__of__(self) return pt() + security.declareProtected('View management screens','editBibliography') def editBibliography(self): """edit the bibliography""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editBibliographyEntry.zpt')).__of__(self) return pt() - + security.declareProtected('View management screens','editPublications') def editPublications(self): """edit the bibliographie""" @@ -364,15 +475,19 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getSortingMode(self): """get sorting mode""" - return getattr(self,'sortingMode','priority') - + mode=getattr(self,'sortingMode','priority') + if mode=="year": + return "year DESC" + else: + return "mode" + def integer(self,value): try: return int(value) except: return 0 - + security.declareProtected('View management screens','changePublications') def changePublications(self): """change the publication list""" self.changeResearch(noredirect=True) @@ -381,7 +496,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.REQUEST.RESPONSE.redirect(self.REQUEST['HTTP_REFERER']) - + security.declareProtected('View management screens','addPublications') def addPublications(self,submit=None,REQUEST=None,noredirect=None): """add publications""" @@ -403,13 +518,13 @@ class MPIWGStaff(CatalogAware,ZSQLExtend for bibId in entries: query="INSERT INTO %s " % "publications" - query+="(id_main,id_institutsbibliographie,publish) " - query+="VALUES ('%s','%s','yes')" %(sql_quote(self.getDBId()),sql_quote(bibId)) - print "ADD",query + query+="(key_main,id_institutsbibliographie,publish) " + query+="VALUES ('%s','%s','yes')" %(sql_quote(self.getKey()),sql_quote(bibId)) + #self.ZSQLAdd(_table="publications",id_institutsbibliographie=bibId,id_main=self.getDBId(),publish='yes') self.ZSQLQuery(query) - self.updatePublicationDB(personId=self.getDBId()) + self.updatePublicationDB(personId=self.getKey()) if not noredirect: @@ -420,24 +535,38 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getDBId(self): """get id from the personal database""" - search=self.ZSQLInlineSearch(_table='personal_www',username=self.getId()) - if search: - return search[0].id - else: - return None + + #in der neuen version ist definitions gemaess der key der Datenbank gleich dem key im Object. + # TODO: remove all occurences of getDBId and replaces it by getKey + return self.getKey() + +# search=self.ZSQLInlineSearch(_table='personal_www',key=self.getKey(),publish_the_data='yes') +# if search:#name existiert und published, dann nimm diesen falls es mehrereeventuell nich publizierte datensaetze gibt. +# return search[0].id +# else:#nicht publiziert dann nimm einen davon +# search2=self.ZSQLInlineSearch(_table='personal_www',username=self.getId()) +# if search2: +# return search2[0].id +# else: +# return None formatBiblHelp=bibliography.formatBiblHelp - def sortBibliography(self,list,sortingMode=None): + def sortBibliography(self,list,sortingMode=None,max=None): if not sortingMode: sortingMode=self.getSortingMode() if sortingMode == "year": - return self.sortYear(list) + l= self.sortYear(list) else: - return self.sortPriority(list) + l=self.sortPriority(list) + + if max: + return l[0:min(len(l),max)] + else: + return l def sortPriority(self,list): def sort(x,y): @@ -452,8 +581,11 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return cmp(xInt,yInt) + if not list: + return [] tmp=[x for x in list] tmp.sort(sort) + return tmp def sortYear(self,list):