--- MPIWGWeb/MPIWGStaff.py	2005/10/12 19:35:38	1.10.2.5
+++ MPIWGWeb/MPIWGStaff.py	2005/10/13 18:00:36	1.10.2.6
@@ -34,16 +34,22 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     default_catalog='MembersCatalog'
     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"""
-        
+        msg=""
         #test ob id schon existiert
         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
-        columnlist="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,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,username,title,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2)
         
         insert=[]
         for element in insertTuple:
@@ -58,7 +64,20 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         if not (txt==""):
             queryStr="INSERT INTO current_work (id_main,current,publish) VALUES ('%s','%s','%s')"%(id,txt,txt_p)
             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):
         """get publication selection mode, default 'priority'"""
         return getattr(self,'publicationSelectionMode','priority')
@@ -300,7 +319,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
             return pt() 
         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:
                 RESPONSE.redirect("editMainData")
                 
@@ -420,11 +439,15 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     
     def getDBId(self):
         """get id from the personal database"""
-        search=self.ZSQLInlineSearch(_table='personal_www',username=self.getId())
-        if search:
+        search=self.ZSQLInlineSearch(_table='personal_www',username=self.getId(),publish_the_data='yes')
+        if search:#name existiert und published, dann nimm diesen falls es mehrereeventuell nich publizierte datensaetze gibt.
             return search[0].id
-        else:
-            return None
+        else:#nicht publiziert dann nimm einen davon
+            search2=self.ZSQLInlineSearch(_table='personal_www',username=self.getId())
+            if search2:
+                return search2[0].id
+            else:
+                return None