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

Diff for /MPIWGWeb/MPIWGStaff.py between versions 1.10.2.55 and 1.10.2.60

version 1.10.2.55, 2008/09/02 12:00:06 version 1.10.2.60, 2008/09/12 12:28:48
Line 21  from AccessControl import ClassSecurityI Line 21  from AccessControl import ClassSecurityI
 import time  import time
 import logging  import logging
 import email  import email
   import re
   from OFS.Cache import Cacheable
   
 from MPIWGHelper import *  from MPIWGHelper import *
 #ersetzt logging  #ersetzt logging
 def logger(txt,method,txt2):  def logger(txt,method,txt2):
Line 54  def createNewDBEntry(self,publish_the_da Line 57  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,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" """          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)          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 70  def createNewDBEntry(self,publish_the_da Line 73  def createNewDBEntry(self,publish_the_da
         self.ZSQLQuery(queryStr)          self.ZSQLQuery(queryStr)
         logging.info("QQQQ %s:"%queryStr)          logging.info("QQQQ %s:"%queryStr)
         #currentwork          #currentwork
         if not (current_work==""):          #if not (current_work==""):
             queryStr="INSERT INTO current_work (key_main,current,publish) VALUES ('%s',%s,'%s')"%(key,self.ZSQLQuote(current_work),"yes")          #    queryStr="INSERT INTO current_work (key_main,current,publish) VALUES ('%s',%s,'%s')"%(key,self.ZSQLQuote(current_work),"yes")
   
             self.ZSQLQuery(queryStr)          #  self.ZSQLQuery(queryStr)
                   
         return True,msg          return True,msg
 class MPIWGStaff(CatalogAware,ZSQLExtendFolder):  class MPIWGStaff(CatalogAware,ZSQLExtendFolder,Cacheable):
     """Staff"""      """Staff"""
   
     meta_type="MPIWGStaff"      meta_type="MPIWGStaff"
Line 161  class MPIWGStaff(CatalogAware,ZSQLExtend Line 164  class MPIWGStaff(CatalogAware,ZSQLExtend
         self.publicationSelectionMode=publicationSelectionMode          self.publicationSelectionMode=publicationSelectionMode
                   
         if RESPONSE:          if RESPONSE:
             self.redirect(RESPONSE,"<Publications")              self.redirect(RESPONSE,"editPublications")
                           
           
     def downloadCV(self,RESPONSE):      def downloadCV(self,RESPONSE):
Line 311  class MPIWGStaff(CatalogAware,ZSQLExtend Line 314  class MPIWGStaff(CatalogAware,ZSQLExtend
         """          """
         return self.id          return self.id
   
     def harvest_page(self):      def harvest_page_old(self,context=None):
         """geharvestete seite = verschlankte version von members_main"""          """geharvestete seite = verschlankte version von members_main"""
         pt = getTemplate(self, "harvest_members_main")          #pt = getTemplate(self, "harvest_members_main")
           
           if not self.isPublished():
               return ""
           if not context:
               context=self
               
           
           ext=getattr(self,"harvest_members_main",None)
           if ext:
               return getattr(self,ext.getId())()
           
           pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','harvest_members_main')).__of__(context)    
   
   
         return pt()          return pt()
   
       def harvest_page(self):
           """harvest"""
           if not self.isPublished():
               return ""
           return getattr(self.en.staff.members,self.getId()).index_html()
           
       
     def index_html(self):      def index_html(self):
         """show homepage"""          """show homepage"""
         pt = getTemplate(self, "members_main")          pt = getTemplate(self, "members_main")
Line 572  class MPIWGStaff(CatalogAware,ZSQLExtend Line 596  class MPIWGStaff(CatalogAware,ZSQLExtend
                   
                   
         if (person.current_work) and (not person.current_work==""):          if (person.current_work) and (not person.current_work==""):
             ret="<p class=\"bio_section_header\">Current work: </p><br/>"              ret+="<p class=\"bio_section_header\">Current work: </p><br/>"
               
             ret+=person.current_work+"<br/>"              ret+=person.current_work+"<br/>"
               if (person.cv) and (not person.cv==""):
         ret+="<br/>"              ret+="<p class=\"bio_section_header\">Curriculum Vitae: </p><br/>"
         ret+=self.formatAscii(person.cv)          ret+=self.formatAscii(person.cv)
                   
         return ret          return ret
Removed from v.1.10.2.55  
changed lines
  Added in v.1.10.2.60

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