--- MPIWGWeb/MPIWGStaff.py	2008/09/07 17:13:32	1.10.2.58
+++ MPIWGWeb/MPIWGStaff.py	2009/04/29 07:53:35	1.10.2.67
@@ -7,8 +7,10 @@ from OFS.Folder import Folder
 from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
+from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Products.ZCatalog.CatalogPathAwareness import CatalogAware
 from Products.versionedFile.extVersionedFile import extVersionedFileFolder
+from AccessControl import getSecurityManager
 
 import os
 import logging
@@ -22,6 +24,7 @@ import time
 import logging
 import email
 import re
+from OFS.Cache import Cacheable
 
 from MPIWGHelper import *
 #ersetzt logging
@@ -32,17 +35,9 @@ def logger(txt,method,txt2):
 departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek"
 
 
-def getTemplate(self, tpName):
-    """get a template file either form the instance or from the product"""
-    ext=self.ZopeFind(self.aq_parent,obj_ids=[tpName])
-    if ext:
-        pt = getattr(self,ext[0][1].getId())
-    else:
-        pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/'+tpName)).__of__(self)
-    assert(pt)
-    return pt
 
-def createNewDBEntry(self,publish_the_data,key,name,vorname,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="",group="",web_object_created="no",current_work=""):
+
+def createNewDBEntry(self,publish_the_data,key,name,vorname,titles_new,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by="",e_mail2="",txt="",txt_p="no",stay_at_mpiwg="",group="",web_object_created="no",current_work=""):
         """lege person in der datenbank an"""
 
         if date_to=="": # wenn date_to leer
@@ -56,8 +51,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",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")
+        columnlist="""publish_the_data,key,last_name,first_name,titles_new,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,titles_new,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:
@@ -78,7 +73,7 @@ def createNewDBEntry(self,publish_the_da
         #  self.ZSQLQuery(queryStr)
         
         return True,msg
-class MPIWGStaff(CatalogAware,ZSQLExtendFolder):
+class MPIWGStaff(CatalogAware,ZSQLExtendFolder,Cacheable):
     """Staff"""
 
     meta_type="MPIWGStaff"
@@ -104,6 +99,10 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         """get db_key utf8"""
         return utf8ify(self.getKey())
     
+    def setKey(self,key):
+	"""set key"""
+	self.key=key
+
     def getKey(self):
         """get database key"""
         if hasattr(self,'key'):
@@ -115,10 +114,14 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         #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    
-         
-            return getattr(self.de,self.de.connection_id)
-        
+    def getConnectionObj(self):
+         """returns connection id (from root)"""
+         try:
+             root = self.getMPIWGRoot()
+             return root.getConnectionObj()
+         except:
+             return self.en.getConnectionObj()
+
     def isPublished(self):
         """gib publications status aus der datenbank aus"""
         key=self.getKey()
@@ -132,7 +135,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
             return False
         
  
-    
+  
     def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg="",position="",abteilung=""): 
         """zpddatedb"""
         if not DBid:
@@ -161,9 +164,9 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         """change PublicationSelectionMode"""
         
         self.publicationSelectionMode=publicationSelectionMode
-        
+        self.ZCacheable_invalidate()
         if RESPONSE:
-            self.redirect(RESPONSE,"<Publications")
+            self.redirect(RESPONSE,"editPublications")
             
     
     def downloadCV(self,RESPONSE):
@@ -194,7 +197,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
    
     def changeDownloads(self,cv_pdf=None,cv_publish=None,publications_pdf=None,publications_publish=None,RESPONSE=None):
         """"change the downloadable files"""
-        
+        self.ZCacheable_invalidate()
         if not hasattr(self,'downloadableFiles'):
            
             extFolder =  extVersionedFileFolder()
@@ -297,8 +300,9 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     manage_options = Folder.manage_options+(
         {'label':'Edit','action':'changeMPIWGStaffForm'},
         {'label':'Change Publications Special','action':'changePublications_specialForm'},
-        )
+        ) + Cacheable.manage_options
     
+    __manager_id = "ramCache"
     def __init__(self,id, lastName,firstName,key):
         """init"""
         self.id=id
@@ -336,14 +340,52 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         """harvest"""
         if not self.isPublished():
             return ""
-        return getattr(self.en.staff.members,self.getId()).index_html()
+        st = getattr(self.en.staff.members,self.getId()).index_html()
+	return st
         
     
     def index_html(self):
         """show homepage"""
+    
+        bound_names={}
+        request = self.REQUEST
+        if request is not None:
+            response = request.response
+            if not response.headers.has_key('content-type'):
+                response.setHeader('content-type', 'text/html')
+
+        security = getSecurityManager()
+        bound_names['user'] = security.getUser()
+
+        # Retrieve the value from the cache.
+        keyset = None
+        if self.ZCacheable_isCachingEnabled():
+            
+            # Prepare a cache key.
+            keyset = {'here': self}
+                      
+            result = self.ZCacheable_get(keywords=keyset)
+           
+            if result is not None:
+                # Got a cached value.
+                return result
+      
         pt = getTemplate(self, "members_main")
-        return pt()
+         # Execute the template in a new security context.
+        security.addContext(self)
 
+        try:
+            result = pt.pt_render(extra_context=bound_names)
+            if keyset is not None:
+                # Store the result in the cache.
+                self.ZCacheable_set(result, keywords=keyset)
+               
+            return result
+        finally:
+            security.removeContext(self)
+       
+
+   
     def changePublications_specialForm(self):
         """Priority publications manual field"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changePublications_special.zpt')).__of__(self)
@@ -351,6 +393,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         
     def changePublications_special(self,usePublicationsSpecial=None,specialPublicationsField=None,RESPONSE=None):
         """change publications special params"""
+        self.ZCacheable_invalidate()
         if usePublicationsSpecial:
           self.usePublicationsSpecial=True
          
@@ -386,6 +429,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     security.declareProtected('View management screens','changeMPIWGStaff')
     def changeMPIWGStaff(self,lastName,firstName,key=None,RESPONSE=None):
         """change it"""
+        self.ZCacheable_invalidate()
         self.title="%s, %s"%(lastName,firstName)
         self.lastName=lastName
         self.firstName=firstName
@@ -459,13 +503,14 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
         query="UPDATE personal_www SET current_work_p =%s WHERE key='%s'"
          
         self.ZSQLQuery(query%(self.ZSQLQuote(publish),key))
-       
+        self.ZCacheable_invalidate()
         if RESPONSE:
             self.redirect(RESPONSE,"edit")
         
     security.declareProtected('View management screens','changeResearch')
     def changeResearch(self,noredirect=None,RESPONSE=None):
         """change the research entries"""
+        self.ZCacheable_invalidate()
         newEntries={}
         key_main=self.REQUEST.form['key_main']
 
@@ -524,7 +569,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
              return pt()
         
          query="UPDATE personal_www SET cv =%s WHERE oid='%s'"
-         
+         self.ZCacheable_invalidate()
          self.ZSQLQuery(query%(self.ZSQLQuote(cv),oid))
         
          if RESPONSE:
@@ -546,12 +591,12 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
             
     def editProfile(self,oid=None,RESPONSE=None, kupu=None, preview=None):
          """edit Profile, new entry replaces CD, current work and research interests"""
-
+        
          if (not oid):
              pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editProfile.zpt')).__of__(self)
              return pt()
         
-         
+         self.ZCacheable_invalidate() 
          
          
          if preview:
@@ -625,7 +670,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
          if (not oid):
              pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editAwards.zpt')).__of__(self)
              return pt()
-        
+         self.ZCacheable_invalidate()
          query="UPDATE personal_www SET awards =%s WHERE oid='%s'"
       
          self.ZSQLQuery(query%(self.ZSQLQuote(awards),oid))
@@ -656,14 +701,14 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     security.declareProtected('View management screens','editMainData')    
     def editMainData(self,REQUEST=None,RESPONSE=None):
         """edit main data"""
-        
+        self.ZCacheable_invalidate()
         argv=REQUEST.form
         
         if not argv.has_key('last_name'):
             pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self)
             return pt() 
         else:
-            self.ZSQLChange(argv,_table="personal_www",_identify="key=%s"%self.getKey(),USE_FORM="yes")
+            self.ZSQLChange(argv,_table="personal_www",_identify="key=%s"%self.getKeyUTF8(),USE_FORM="yes")
             if RESPONSE:
                 self.redirect(RESPONSE,"editMainData")
                 
@@ -721,6 +766,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     
     def changeSortingMode(self,sortingMode,RESPONSE=None,REQUEST=None):
         """change sorting mode"""
+        self.ZCacheable_invalidate()
         self.sortingMode=sortingMode
         
         if RESPONSE and REQUEST:
@@ -746,7 +792,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
     def changePublications(self,RESPONSE=None):
         """change the publication list"""
         self.changeResearch(noredirect=True)
-        
+        self.ZCacheable_invalidate()
         #self.updatePublicationDB(personId=self.getDBId())
         self.redirect(RESPONSE,self.REQUEST['HTTP_REFERER'])