--- MPIWGWeb/MPIWGStaff.py	2008/09/02 09:06:32	1.10.2.54
+++ MPIWGWeb/MPIWGStaff.py	2008/09/12 12:28:48	1.10.2.60
@@ -21,6 +21,10 @@ from AccessControl import ClassSecurityI
 import time
 import logging
 import email
+import re
+from OFS.Cache import Cacheable
+
+from MPIWGHelper import *
 #ersetzt logging
 def logger(txt,method,txt2):
     """logging""" 
@@ -53,8 +57,8 @@ def createNewDBEntry(self,publish_the_da
             return False,"ERROR:key%s already exists"%key
         
         #eintragen
-        columnlist="""publish_the_data,key,last_name,first_name,title,status,e_mail,e_mail_p,date_from,date_to,department,home_inst,funded_by,e_mail2,date_stay_at_mpiwg,web_object_created,"group" """
-        insertTuple=(publish_the_data,key,name,vorname,title,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg,web_object_created,group)
+        columnlist="""publish_the_data,key,last_name,first_name,title,status,e_mail,e_mail_p,date_from,date_to,department,home_inst,funded_by,e_mail2,date_stay_at_mpiwg,web_object_created,"group",current_work,current_work_p """
+        insertTuple=(publish_the_data,key,name,vorname,title,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg,web_object_created,group,current_work,"yes")
         
         insert=[]
         for element in insertTuple:
@@ -69,13 +73,13 @@ def createNewDBEntry(self,publish_the_da
         self.ZSQLQuery(queryStr)
         logging.info("QQQQ %s:"%queryStr)
         #currentwork
-        if not (current_work==""):
-            queryStr="INSERT INTO current_work (key_main,current,publish) VALUES ('%s',%s,'%s')"%(key,self.ZSQLQuote(current_work),"yes")
+        #if not (current_work==""):
+        #    queryStr="INSERT INTO current_work (key_main,current,publish) VALUES ('%s',%s,'%s')"%(key,self.ZSQLQuote(current_work),"yes")
 
-            self.ZSQLQuery(queryStr)
+        #  self.ZSQLQuery(queryStr)
         
         return True,msg
-class MPIWGStaff(CatalogAware,ZSQLExtendFolder):
+class MPIWGStaff(CatalogAware,ZSQLExtendFolder,Cacheable):
     """Staff"""
 
     meta_type="MPIWGStaff"
@@ -97,12 +101,19 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         logging.error(email.Utils.formatdate()+' GMT')
         RESPONSE.redirect(url+addStr%timeStamp)
         
+    def getKeyUTF8(self):
+        """get db_key utf8"""
+        return utf8ify(self.getKey())
+    
     def getKey(self):
         """get database key"""
         if hasattr(self,'key'):
-            return self.key.lower()
+            #logging.error("SAVED KEY:%s"%self.key)
+            return unicodify(self.key.lower())
+            #return self.key.lower()
         
         #fuer alt faelle ohne key
+        #logging.error("NEW KEY:%s"%(self.firstName+'_'+self.lastName).lower().replace(' ',''))
         return (self.firstName+'_'+self.lastName).lower().replace(' ','')
         
     def getConnectionObj(self):#ueberschreibe connection id methode    
@@ -153,7 +164,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         self.publicationSelectionMode=publicationSelectionMode
         
         if RESPONSE:
-            self.redirect(RESPONSE,"<Publications")
+            self.redirect(RESPONSE,"editPublications")
             
     
     def downloadCV(self,RESPONSE):
@@ -303,11 +314,32 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         """
         return self.id
 
-    def harvest_page(self):
+    def harvest_page_old(self,context=None):
         """geharvestete seite = verschlankte version von members_main"""
-        pt = getTemplate(self, "harvest_members_main")
+        #pt = getTemplate(self, "harvest_members_main")
+        
+        if not self.isPublished():
+            return ""
+        if not context:
+            context=self
+            
+        
+        ext=getattr(self,"harvest_members_main",None)
+        if ext:
+            return getattr(self,ext.getId())()
+        
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','harvest_members_main')).__of__(context)    
+
+
         return pt()
 
+    def harvest_page(self):
+        """harvest"""
+        if not self.isPublished():
+            return ""
+        return getattr(self.en.staff.members,self.getId()).index_html()
+        
+    
     def index_html(self):
         """show homepage"""
         pt = getTemplate(self, "members_main")
@@ -564,12 +596,12 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         
         
         if (person.current_work) and (not person.current_work==""):
-            ret="<p class=\"bio_section_header\">Current work: </p><br/>"
+            ret+="<p class=\"bio_section_header\">Current work: </p><br/>"
       
             ret+=person.current_work+"<br/>"
-    
-        ret+="<br/>"
-        ret+=self.formatAscii(person.cv)
+    	if (person.cv) and (not person.cv==""):
+            ret+="<p class=\"bio_section_header\">Curriculum Vitae: </p><br/>"
+	    ret+=self.formatAscii(person.cv)
         
         return ret
     security.declareProtected('View management screens','editDownloads')
@@ -720,6 +752,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         self.redirect(RESPONSE,self.REQUEST['HTTP_REFERER'])
         
 
+  
     security.declareProtected('View management screens','addPublications')    
     def addPublications(self,submit=None,REQUEST=None,noredirect=None,RESPONSE=None):
         """add publications"""