--- MPIWGWeb/MPIWGStaff.py	2008/09/02 12:00:06	1.10.2.55
+++ MPIWGWeb/MPIWGStaff.py	2008/09/05 14:08:24	1.10.2.57
@@ -21,6 +21,8 @@ from AccessControl import ClassSecurityI
 import time
 import logging
 import email
+import re
+
 from MPIWGHelper import *
 #ersetzt logging
 def logger(txt,method,txt2):
@@ -54,8 +56,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:
@@ -70,10 +72,10 @@ 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):
@@ -311,11 +313,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")