--- MPIWGWeb/MPIWGStaff.py 2006/12/08 13:54:41 1.10.2.32 +++ MPIWGWeb/MPIWGStaff.py 2007/04/18 10:03:13 1.10.2.33 @@ -9,14 +9,19 @@ from Products.PageTemplates.PageTemplate from Products.PageTemplates.PageTemplate import PageTemplate from Products.ZCatalog.CatalogPathAwareness import CatalogAware import os -import zLOG +import logging import bibliography from Globals import package_home from Products.PythonScripts.standard import sql_quote from types import * from AccessControl import ClassSecurityInfo -import zLOG +import logging + +#ersetzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek" @@ -31,6 +36,42 @@ def getTemplate(self, tpName): assert(pt) return pt +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 key from personal_www where key='%s'"%id): + 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) + + insert=[] + for element in insertTuple: + 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,insertStr) + self.ZSQLQuery("SET DATESTYLE TO 'German'") + self.ZSQLQuery(queryStr) + logging.error("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") + + self.ZSQLQuery(queryStr) + + return True,msg class MPIWGStaff(CatalogAware,ZSQLExtendFolder): """Staff""" @@ -39,14 +80,22 @@ class MPIWGStaff(CatalogAware,ZSQLExtend 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() + 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""" - username=self.getId() - query="select count(publish_the_data) from personal_www where username='%s' and publish_the_data='yes'"%username + 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) @@ -55,46 +104,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend else: return False - 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""" - - if date_to=="": # wenn date_to leer - date_to=="date_none" - - msg="" - #test ob id schon existiert - if self.ZSQLQuery("select id from personal_www where id='%s'"%id): - return False,"ERROR:id %s already exists"%id - - if self.ZSQLQuery("select username from personal_www where username='%s' and publish_the_data='yes'"%username): - - return False,"ERROR:username %s already exists and has data published, id=%s not added (running update again might solve this problem)"%(username,id) - - 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,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: - if element=="date_none": # date_none eintrag wird zu null uebersetzt - insert.append('null') - else: - insert.append("'%s'"%element) - - 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="",position="",abteilung=""): """zpddatedb""" @@ -108,14 +118,13 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if test and (len(test)>0): #dataset exists - zLOG.LOG("MPIWG Web",zLOG.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, + 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 + return True else: - return False + return False def getPublicationSelectionMode(self): """get publication selection mode, default 'priority'""" @@ -146,10 +155,10 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if xp > 0: ext = file.filename[xp:] fn = self.getId()+ext - zLOG.LOG("MPWIG STAFF", zLOG.INFO, "new filename: %s"%fn) + logger("MPWIG STAFF", logging.INFO, "new filename: %s"%fn) self.getImageFolder().addImage2(file,fileName=fn) else: - zLOG.LOG("MPWIG STAFF", zLOG.ERROR, "uploaded filename %s has no extension!"%file.filename) + logger("MPWIG STAFF", logging.ERROR, "uploaded filename %s has no extension!"%file.filename) self.publishImage=publishImage @@ -163,7 +172,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend 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") + logger("MPWIG STAFF", logging.ERROR, "image folder not found:"," has to be add /www_neu/staff_images") return None def getImageObj(self): @@ -199,12 +208,13 @@ 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""" @@ -291,7 +301,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend 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={} @@ -320,8 +330,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend #new entries for newEntry in newEntries.keys(): query="INSERT INTO %s "%newEntry - keys=['id_main'] - values=["'"+sql_quote(id_main)+"'"] + keys=['key_main'] + values=["'"+sql_quote(key_main)+"'"] for key in newEntries[newEntry].keys(): keys.append(key) values.append("'"+sql_quote(newEntries[newEntry][key])+"'") @@ -390,16 +400,16 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return "\n".join(list) security.declareProtected('View management screens','editMainData') - def editMainData(self,REQUEST=None,RESPONSE=None,name=None,**argv): + 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: - print argv - 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") @@ -425,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()) @@ -465,8 +475,12 @@ 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) @@ -504,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)) + 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: @@ -521,28 +535,38 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getDBId(self): """get id from the personal database""" - search=self.ZSQLInlineSearch(_table='personal_www',username=self.getId(),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 + + #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): @@ -557,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):