--- MPIWGWeb/MPIWGStaff.py	2005/11/22 17:58:27	1.10.2.18
+++ MPIWGWeb/MPIWGStaff.py	2006/04/21 17:58:45	1.10.2.26
@@ -9,6 +9,7 @@ from Products.PageTemplates.PageTemplate
 from Products.PageTemplates.PageTemplate import PageTemplate
 from Products.ZCatalog.CatalogPathAwareness import CatalogAware
 import os
+import zLOG
 import bibliography
 from Globals import package_home
 from Products.PythonScripts.standard import sql_quote
@@ -88,17 +89,25 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         
         return True,msg
     
-    def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg="",position=""): 
+    def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg="",position="",abteilung=""): 
         """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,
+        test=self.ZSQLQuery("select id from personal_www where id='%s' "%DBid)
+
+        
+        if test and (len(test)>0): #dataset exists
+	    zLOG.LOG("MPIWG Web",zLOG.INFO,'UPDATE: _table="personal_www",_identify="id=%s"'%DBid+',publish_the_data=%s'%publish_the_data+',date_from=%s'%date_from+',date_to=%s'%date_to+',stay_at_mpiwg=%s'%stay_at_mpiwg+',position=%s'%position)
+ 
+	    self.ZSQLChange(_table="personal_www",_identify="id=%s"%DBid,publish_the_data=publish_the_data,
                                    date_from=date_from,
-                                   date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position)
-                  
+                                   date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position,abteilung=abteilung)
+	    return True
+        else:
+	    return False
           
     def getPublicationSelectionMode(self):
         """get publication selection mode, default 'priority'"""
@@ -122,9 +131,17 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
 
         if file and not(file.filename==""):
             if self.getImageObj():
-                     self.getImageObj().updateImage(file,rename=None,RESPONSE=None)
+		self.getImageObj().updateImage(file,rename=None,RESPONSE=None)
             else:
-                     self.getImageFolder().addImage2(file,fileName=self.getId())
+		# create new image object
+		xp = file.filename.rfind('.')
+		if xp > 0:
+		    ext = file.filename[xp:]
+		    fn = self.getId()+ext
+		    zLOG.LOG("MPWIG STAFF", zLOG.INFO, "new filename: %s"%fn)
+		    self.getImageFolder().addImage2(file,fileName=fn)
+		else:
+		    zLOG.LOG("MPWIG STAFF", zLOG.ERROR, "uploaded filename %s has no extension!"%file.filename)
             
         self.publishImage=publishImage
         
@@ -239,7 +256,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     security.declareProtected('View management screens','edit')
     def edit(self):
         """Edit the pages"""
-    #TODO: zusammenspiel mit apache, redirect auf 18080 rausnehmen bzw. zumindest verallgemeinern
+        #TODO: zusammenspiel mit apache, redirect auf 18080 rausnehmen bzw. zumindest verallgemeinern
         if self.REQUEST['SERVER_URL']=="http://www.mpiwg-berlin.mpg.de":
                 redURL="http://xserve04.mpiwg-berlin.mpg.de:18080/www_neu/de/mitarbeiter/members/%s/edit"%self.getId()
         
@@ -314,13 +331,13 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     def editCV(self,cv=None,oid=None,RESPONSE=None):
          """edit Cv"""
 
-         if (not cv):
+         if (not oid):
              pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editCV.zpt')).__of__(self)
              return pt()
         
-         query="UPDATE personal_www SET cv ='%s' WHERE oid='%s'"
-
-         self.ZSQLQuery(query%(cv,oid))
+         query="UPDATE personal_www SET cv =%s WHERE oid='%s'"
+         
+         self.ZSQLQuery(query%(self.ZSQLQuote(cv),oid))
         
          if RESPONSE:
             RESPONSE.redirect("editCV")
@@ -328,14 +345,14 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     security.declareProtected('View management screens','editAwards')    
     def editAwards(self,awards=None,oid=None,RESPONSE=None):
          """edit a awards"""
-
-         if (not awards):
+     
+         if (not oid):
              pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editAwards.zpt')).__of__(self)
              return pt()
         
-         query="UPDATE personal_www SET awards ='%s' WHERE oid='%s'"
-
-         self.ZSQLQuery(query%(awards,oid))
+         query="UPDATE personal_www SET awards =%s WHERE oid='%s'"
+      
+         self.ZSQLQuery(query%(self.ZSQLQuote(awards),oid))
         
          if RESPONSE:
             RESPONSE.redirect("editAwards")
@@ -369,7 +386,6 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
             pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self)
             return pt() 
         else:
-            
             self.ZSQLChange(argv,_table="personal_www",_identify="id=%s"%self.getDBId(),USE_FORM="yes")
             if RESPONSE:
                 RESPONSE.redirect("editMainData")