--- MPIWGWeb/MPIWGStaff.py	2005/10/18 13:00:04	1.10.2.12
+++ MPIWGWeb/MPIWGStaff.py	2005/11/11 15:02:27	1.10.2.16
@@ -15,6 +15,8 @@ from Products.PythonScripts.standard imp
 from types import *
 from AccessControl import ClassSecurityInfo
 
+import zLOG
+
 departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek"
 
 
@@ -52,7 +54,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         else:
             return False
         
-    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"):
+    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",stay_at_mpiwg=""):
         """lege person in der datenbank an"""
         msg=""
         #test ob id schon existiert
@@ -66,15 +68,15 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         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,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)
+        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,stay_at_mpiwg"
+        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,stay_at_mpiwg)
         
         insert=[]
         for element in insertTuple:
             insert.append("'%s'"%element)
         
         insertStr=",".join(insert)
-        queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertTuple)
+        queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr)
         
         self.ZSQLQuery(queryStr)
         
@@ -85,7 +87,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         
         return True,msg
     
-    def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None): 
+    def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg="",position=""): 
         """zpddatedb"""
         if not DBid:
             DBid=self.getDBId()
@@ -94,7 +96,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
 
         self.ZSQLChange(_table="personal_www",_identify="id=%s"%DBid,publish_the_data=publish_the_data,
                                    date_from=date_from,
-                                   date_to=date_to)
+                                   date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position)
                   
           
     def getPublicationSelectionMode(self):
@@ -130,12 +132,20 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
             
     def getImageFolder(self):
         """getImageFolder"""
-        return self.getPhysicalRoot().www_neu.images.staff_images
-    
+        #TODO: make place of staff image folder configurable
+        
+        try:
+            return self.getPhysicalRoot().www_neu.images.staff_images
+        except: 
+            zLOG.LOG("MPWIG STAFF", zLOG.ERROR, "image folder not found:"," has to be add /www_neu/staff_images") 
+            return None
+        
     def getImageObj(self):
         """getImage"""
         imageFolder=self.getImageFolder()
         
+        if not imageFolder: return None
+        
         image=getattr(imageFolder,self.getId(),None)
 
         if not image:
@@ -359,7 +369,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
             return pt() 
         else:
             
-            self.ZSQLChange(argv,_table="personal_www",_identify="<%s"%self.getDBId(),USE_FORM="yes")
+            self.ZSQLChange(argv,_table="personal_www",_identify="id=%s"%self.getDBId(),USE_FORM="yes")
             if RESPONSE:
                 RESPONSE.redirect("editMainData")