--- MPIWGWeb/MPIWGStaff.py	2006/01/16 13:46:21	1.10.2.23
+++ MPIWGWeb/MPIWGStaff.py	2006/11/08 16:36:38	1.10.2.30
@@ -57,6 +57,10 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         
     def createNewDBEntry(self,publish_the_data,id,name,vorname,username,title,position,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"""
+
+	if date_to=="": # wenn date_to leer
+             date_to=="date_none"
+
         msg=""
         #test ob id schon existiert
         if self.ZSQLQuery("select id from personal_www where id='%s'"%id):
@@ -74,7 +78,10 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         
         insert=[]
         for element in insertTuple:
-            insert.append("'%s'"%element)
+	    if element=="date_none": # date_none eintrag wird zu null uebersetzt
+		insert.append('null')
+	    else:
+		insert.append("'%s'"%element)
         
         insertStr=",".join(insert)
         queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr)
@@ -89,11 +96,12 @@ 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()
-         
+	            DBid=self.getDBId()
+        
+ 
         self.ZSQLQuery("SET DATESTYLE TO 'German'")
 
         test=self.ZSQLQuery("select id from personal_www where id='%s' "%DBid)
@@ -104,7 +112,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,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
@@ -131,9 +139,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
         
@@ -190,6 +206,10 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         self.lastName=lastName
         self.firstName=firstName
 
+    def harvest_page(self):
+        """geharvestete seite = verschlankte version von members_main"""
+        pt = getTemplate(self, "harvest_members_main")
+        return pt()
 
     def index_html(self):
         """show homepage"""
@@ -248,7 +268,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()
         
@@ -301,10 +321,10 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         for newEntry in newEntries.keys():
             query="INSERT INTO %s "%newEntry
             keys=['id_main']
-            values=["'"+id_main+"'"]
+            values=["'"+sql_quote(id_main)+"'"]
             for key in newEntries[newEntry].keys():
                 keys.append(key)
-                values.append("'"+newEntries[newEntry][key]+"'")
+                values.append("'"+sql_quote(newEntries[newEntry][key])+"'")
 
 
             keystring=",".join(keys)
@@ -378,7 +398,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
             pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self)
             return pt() 
         else:
-            
+	    print argv
             self.ZSQLChange(argv,_table="personal_www",_identify="id=%s"%self.getDBId(),USE_FORM="yes")
             if RESPONSE:
                 RESPONSE.redirect("editMainData")