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

Diff for /MPIWGWeb/MPIWGStaff.py between versions 1.10.2.5 and 1.10.2.6

version 1.10.2.5, 2005/10/12 19:35:38 version 1.10.2.6, 2005/10/13 18:00:36
Line 34  class MPIWGStaff(CatalogAware,ZSQLExtend Line 34  class MPIWGStaff(CatalogAware,ZSQLExtend
     default_catalog='MembersCatalog'      default_catalog='MembersCatalog'
     departmentList=departmentList      departmentList=departmentList
           
     def createNewDBEntry(self,publish_the_data,id,name,vorname,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by="",e_mail2="",txt="",txt_p="no"):      def createNewDBEntry(self,publish_the_data,id,name,vorname,username,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by="",e_mail2="",txt="",txt_p="no"):
         """lege person in der datenbank an"""          """lege person in der datenbank an"""
                   msg=""
         #test ob id schon existiert          #test ob id schon existiert
         if self.ZSQLQuery("select id from personal_www where id='%s'"%id):          if self.ZSQLQuery("select id from personal_www where id='%s'"%id):
             return False,"id %s already exists"%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          #eintragen
         columnlist="publish_the_data,id,name,vorname,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2"          columnlist="publish_the_data,id,name,vorname,username,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2"
         insertTuple=(publish_the_data,id,name,vorname,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2)          insertTuple=(publish_the_data,id,name,vorname,username,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2)
                   
         insert=[]          insert=[]
         for element in insertTuple:          for element in insertTuple:
Line 59  class MPIWGStaff(CatalogAware,ZSQLExtend Line 65  class MPIWGStaff(CatalogAware,ZSQLExtend
             queryStr="INSERT INTO current_work (id_main,current,publish) VALUES ('%s','%s','%s')"%(id,txt,txt_p)              queryStr="INSERT INTO current_work (id_main,current,publish) VALUES ('%s','%s','%s')"%(id,txt,txt_p)
             self.ZSQLQuery(queryStr)              self.ZSQLQuery(queryStr)
                     
           return True,msg
       
       def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None): 
           """zpddatedb"""
           if not DBid:
               DBid=self.getDBId()
            
           self.ZSQLQuery("SET DATESTYLE TO 'German'")
           self.ZSQLChange(_table="personal_www",_identify="id=%s"%DBid,publish_the_data=publish_the_data,
                                      date_from=date_from,
                                      date_to=date_to)
                     
             
     def getPublicationSelectionMode(self):      def getPublicationSelectionMode(self):
         """get publication selection mode, default 'priority'"""          """get publication selection mode, default 'priority'"""
         return getattr(self,'publicationSelectionMode','priority')          return getattr(self,'publicationSelectionMode','priority')
Line 300  class MPIWGStaff(CatalogAware,ZSQLExtend Line 319  class MPIWGStaff(CatalogAware,ZSQLExtend
             return pt()               return pt() 
         else:          else:
                           
             self.ZSQLChange(argv,_table="personal_www",_identify="id=%s"%self.getDBId(),USE_FORM="yes")              self.ZSQLChange(argv,_table="personal_www",_identify="<%s"%self.getDBId(),USE_FORM="yes")
             if RESPONSE:              if RESPONSE:
                 RESPONSE.redirect("editMainData")                  RESPONSE.redirect("editMainData")
                                   
Line 420  class MPIWGStaff(CatalogAware,ZSQLExtend Line 439  class MPIWGStaff(CatalogAware,ZSQLExtend
           
     def getDBId(self):      def getDBId(self):
         """get id from the personal database"""          """get id from the personal database"""
         search=self.ZSQLInlineSearch(_table='personal_www',username=self.getId())          search=self.ZSQLInlineSearch(_table='personal_www',username=self.getId(),publish_the_data='yes')
         if search:          if search:#name existiert und published, dann nimm diesen falls es mehrereeventuell nich publizierte datensaetze gibt.
             return search[0].id              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:          else:
             return None              return None
                   
Removed from v.1.10.2.5  
changed lines
  Added in v.1.10.2.6

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