[BACK]Return to MPIWGStaff.py CVS log [TXT] [DIR] Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGStaff.py between versions 1.10.2.67 and 1.11

version 1.10.2.67, 2009/04/29 07:53:35 version 1.11, 2009/02/18 13:01:17
Line 37  departmentList="Renn\nRheinberger\nDasto Line 37  departmentList="Renn\nRheinberger\nDasto
   
   
   
 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=""):  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"""          """lege person in der datenbank an"""
   
         if date_to=="": # wenn date_to leer          if date_to=="": # wenn date_to leer
Line 51  def createNewDBEntry(self,publish_the_da Line 51  def createNewDBEntry(self,publish_the_da
             return False,"ERROR:key%s already exists"%key              return False,"ERROR:key%s already exists"%key
                   
         #eintragen          #eintragen
         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 """          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,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")          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=[]          insert=[]
         for element in insertTuple:          for element in insertTuple:
Line 116  class MPIWGStaff(CatalogAware,ZSQLExtend Line 116  class MPIWGStaff(CatalogAware,ZSQLExtend
                   
     def getConnectionObj(self):      def getConnectionObj(self):
          """returns connection id (from root)"""           """returns connection id (from root)"""
          try:  
              root = self.getMPIWGRoot()               root = self.getMPIWGRoot()
              return root.getConnectionObj()               return root.getConnectionObj()
          except:  
              return self.en.getConnectionObj()  
   
     def isPublished(self):      def isPublished(self):
         """gib publications status aus der datenbank aus"""          """gib publications status aus der datenbank aus"""
Line 340  class MPIWGStaff(CatalogAware,ZSQLExtend Line 337  class MPIWGStaff(CatalogAware,ZSQLExtend
         """harvest"""          """harvest"""
         if not self.isPublished():          if not self.isPublished():
             return ""              return ""
         st = getattr(self.en.staff.members,self.getId()).index_html()          return getattr(self.en.staff.members,self.getId()).index_html()
     return st  
                   
           
     def index_html(self):      def index_html(self):
Removed from v.1.10.2.67  
changed lines
  Added in v.1.11

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>