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

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

version 1.10.2.73, 2009/12/15 13:16:47 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):
Line 370  class MPIWGStaff(CatalogAware,ZSQLExtend Line 366  class MPIWGStaff(CatalogAware,ZSQLExtend
                 # Got a cached value.                  # Got a cached value.
                 return result                  return result
                   
         # look for individual page  
         if self.hasObject("index.html"):  
             pt = getattr(self, "index.html")  
         # else use template  
         else:  
             pt = getTemplate(self, "members_main")              pt = getTemplate(self, "members_main")
         # Execute the template in a new security context.          # Execute the template in a new security context.
         security.addContext(self)          security.addContext(self)
Line 585  class MPIWGStaff(CatalogAware,ZSQLExtend Line 576  class MPIWGStaff(CatalogAware,ZSQLExtend
         """get the profile"""          """get the profile"""
     self.REQUEST.RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT')      self.REQUEST.RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT')
               
         founds=self.ZSQLInlineSearchU(_table='personal_www',key=self.getKeyUTF8())          founds=self.ZSQLInlineSearchU(_table='personal_www',key=self.getKey())
         html="""<html><body>%s</body></html>"""          html="""<html><body>%s</body></html>"""
         if founds.profile and founds.profile != "":          if founds.profile and founds.profile != "":
                         
Line 637  class MPIWGStaff(CatalogAware,ZSQLExtend Line 628  class MPIWGStaff(CatalogAware,ZSQLExtend
         """erzeugt ein automatisches Profil aus den alten Eintraegen  CV, Current work, und research interests"""          """erzeugt ein automatisches Profil aus den alten Eintraegen  CV, Current work, und research interests"""
                   
         ret=""          ret=""
         founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.getKeyUTF8())          founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.key)
         if founds:          if founds:
             ret="<p class=\"bio_section_header\">Research interests: </p><br/>"              ret="<p class=\"bio_section_header\">Research interests: </p><br/>"
         for found in self.sortPriority(founds):          for found in self.sortPriority(founds):
Line 713  class MPIWGStaff(CatalogAware,ZSQLExtend Line 704  class MPIWGStaff(CatalogAware,ZSQLExtend
             pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self)              pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self)
             return pt()               return pt() 
         else:          else:
             self.ZSQLChange(argv,_table="personal_www",_identify="lower(key)=%s"%utf8ify(self.getKey().lower()),USE_FORM="yes")              self.ZSQLChange(argv,_table="personal_www",_identify="key=%s"%self.getKeyUTF8(),USE_FORM="yes")
             if RESPONSE:              if RESPONSE:
                 self.redirect(RESPONSE,"editMainData")                  self.redirect(RESPONSE,"editMainData")
                                   
Removed from v.1.10.2.73  
changed lines
  Added in v.1.11

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