--- MPIWGWeb/MPIWGStaff.py 2009/04/17 14:29:13 1.10.2.66 +++ MPIWGWeb/MPIWGStaff.py 2009/06/10 15:12:44 1.10.2.68 @@ -37,7 +37,7 @@ departmentList="Renn\nRheinberger\nDasto -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=""): +def createNewDBEntry(self,publish_the_data,key,name,vorname,titles_new,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 @@ -51,8 +51,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",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") + columnlist="""publish_the_data,key,last_name,first_name,titles_new,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,titles_new,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: @@ -121,6 +121,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return root.getConnectionObj() except: return self.en.getConnectionObj() + def isPublished(self): """gib publications status aus der datenbank aus""" key=self.getKey() @@ -339,7 +340,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend """harvest""" if not self.isPublished(): return "" - return getattr(self.en.staff.members,self.getId()).index_html() + st = getattr(self.en.staff.members,self.getId()).index_html() + return st def index_html(self): @@ -578,7 +580,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend """get the profile""" self.REQUEST.RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT') - founds=self.ZSQLInlineSearchU(_table='personal_www',key=self.getKey()) + founds=self.ZSQLInlineSearchU(_table='personal_www',key=self.getKeyUTF8()) html="""%s""" if founds.profile and founds.profile != "":