--- MPIWGWeb/MPIWGStaff.py 2005/10/24 22:56:22 1.10.2.14 +++ MPIWGWeb/MPIWGStaff.py 2005/12/22 21:10:14 1.10.2.22 @@ -15,6 +15,8 @@ from Products.PythonScripts.standard imp from types import * from AccessControl import ClassSecurityInfo +import zLOG + departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek" @@ -52,7 +54,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend else: return False - def createNewDBEntry(self,publish_the_data,id,name,vorname,username,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by="",e_mail2="",txt="",txt_p="no",stay_at_mpiwg=""): + def createNewDBEntry(self,publish_the_data,id,name,vorname,username,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=""): """lege person in der datenbank an""" msg="" #test ob id schon existiert @@ -66,8 +68,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if self.ZSQLQuery("select username from personal_www where username='%s' and not publish_the_data='yes'"%username): msg="WARNING:username %s not unique but id=%s added"%(username,id) #eintragen - columnlist="publish_the_data,id,name,vorname,username,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg" - insertTuple=(publish_the_data,id,name,vorname,username,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg) + columnlist="publish_the_data,id,name,vorname,username,title,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg" + insertTuple=(publish_the_data,id,name,vorname,username,title,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg) insert=[] for element in insertTuple: @@ -75,27 +77,34 @@ class MPIWGStaff(CatalogAware,ZSQLExtend insertStr=",".join(insert) queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr) - + self.ZSQLQuery("SET DATESTYLE TO 'German'") self.ZSQLQuery(queryStr) - + #currentwork if not (txt==""): queryStr="INSERT INTO current_work (id_main,current,publish) VALUES ('%s','%s','%s')"%(id,txt,txt_p) + self.ZSQLQuery(queryStr) return True,msg - def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg=""): + def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg="",position=""): """zpddatedb""" if not DBid: DBid=self.getDBId() self.ZSQLQuery("SET DATESTYLE TO 'German'") - self.ZSQLChange(_table="personal_www",_identify="id=%s"%DBid,publish_the_data=publish_the_data, + test=self.ZSQLQuery("select id from personal_www where id='%s' "%DBid) + + + if test and (len(test)>0): #dataset exists + 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) - + date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position) + return True + else: + return False def getPublicationSelectionMode(self): """get publication selection mode, default 'priority'""" @@ -130,12 +139,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: + zLOG.LOG("MPWIG STAFF", zLOG.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: @@ -303,13 +320,13 @@ class MPIWGStaff(CatalogAware,ZSQLExtend 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") @@ -317,14 +334,14 @@ class MPIWGStaff(CatalogAware,ZSQLExtend 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") @@ -359,7 +376,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return pt() else: - self.ZSQLChange(argv,_table="personal_www",_identify="<%s"%self.getDBId(),USE_FORM="yes") + self.ZSQLChange(argv,_table="personal_www",_identify="id=%s"%self.getDBId(),USE_FORM="yes") if RESPONSE: RESPONSE.redirect("editMainData") @@ -466,7 +483,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend 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 + #self.ZSQLAdd(_table="publications",id_institutsbibliographie=bibId,id_main=self.getDBId(),publish='yes') self.ZSQLQuery(query)