--- MPIWGWeb/MPIWGStaff.py 2008/09/08 08:07:42 1.10.2.59
+++ MPIWGWeb/MPIWGStaff.py 2012/01/09 07:33:30 1.10.2.79
@@ -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,8 @@ import time
import logging
import email
import re
+from OFS.Cache import Cacheable
+import urllib2
from MPIWGHelper import *
#ersetzt logging
@@ -30,19 +34,11 @@ def logger(txt,method,txt2):
logging.info(txt+ txt2)
departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek"
+coneService="http://127.0.0.1:8280/MetaDataManagerRestlet/cone/" # kann in MPIWGRoot konfiguriert werden.
-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 +52,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,12 +74,13 @@ 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"
default_catalog='MembersCatalog'
departmentList=departmentList
+ _v_cone=None;
security=ClassSecurityInfo()
def redirect(self,RESPONSE,url):
@@ -104,6 +101,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 +116,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 +137,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,7 +166,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
"""change PublicationSelectionMode"""
self.publicationSelectionMode=publicationSelectionMode
-
+ self.ZCacheable_invalidate()
if RESPONSE:
self.redirect(RESPONSE,"editPublications")
@@ -194,7 +199,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()
@@ -233,7 +238,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
"""publish the image??, default no"""
return getattr(self,'publishImage','no')
- def updateImage(self,file,publishImage,rename=None,RESPONSE=None):
+ def updateImage(self,publishImage,file=None,rename=None,RESPONSE=None):
"""update image"""
if file and not(file.filename==""):
@@ -297,8 +302,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
@@ -313,6 +319,23 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
"""
return self.id
+ def getConeUrl(self):
+ """gibt coneURL zurueck"""
+
+ self.coneService=getattr(self, "coneServiceURL",coneService)
+ logging.debug("coneservice:"+self.coneService)
+ if self._v_cone==None:
+ try:
+ cone = urllib2.urlopen(self.coneService+self.getPersonID())
+ self._v_cone=cone.read()
+ except:
+ return None
+
+ return self._v_cone
+
+
+
+
def harvest_page_old(self,context=None):
"""geharvestete seite = verschlankte version von members_main"""
#pt = getTemplate(self, "harvest_members_main")
@@ -332,18 +355,64 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
return pt()
- def harvest_page(self):
+ def harvest_page(self,mode="normal"):
"""harvest"""
if not self.isPublished():
- return ""
- return getattr(self.en.staff.members,self.getId()).index_html()
+ return
+ st = getattr(self.en.staff.members,self.getId()).index_html(mode)
+ return st
- def index_html(self):
+ def index_html(self,mode="normal"):
"""show homepage"""
- pt = getTemplate(self, "members_main")
- return pt()
+
+ 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
+
+ # look for individual page
+ if self.hasObject("index.html"):
+ pt = getattr(self, "index.html")
+ # else use template
+ else:
+ if mode=="slim":
+ pt = getTemplate(self, "members_main_slim")
+ else:
+ pt = getTemplate(self, "members_main")
+ # 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 +420,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 +456,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
@@ -407,7 +478,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self)
- logging.error("XX:"+email.Utils.formatdate().split("-")[0]+'GMT')
+ logging.debug("XX:"+email.Utils.formatdate().split("-")[0]+'GMT')
return pt()
mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt'))
@@ -459,13 +530,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 +596,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:
@@ -535,7 +607,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
"""get the profile"""
self.REQUEST.RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT')
- founds=self.ZSQLInlineSearchU(_table='personal_www',key=self.getKey())
+ founds=self.ZSQLInlineSearchU(_table='personal_www',key=self.getKeyUTF8())
html="""%s"""
if founds.profile and founds.profile != "":
@@ -546,12 +618,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:
@@ -587,6 +659,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend
"""erzeugt ein automatisches Profil aus den alten Eintraegen CV, Current work, und research interests"""
ret=""
+ #founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.getKeyUTF8())
founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.key)
if founds:
ret="
"
@@ -625,7 +698,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 +729,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="lower(key)=%s"%utf8ify(self.getKey().lower()),USE_FORM="yes")
if RESPONSE:
self.redirect(RESPONSE,"editMainData")
@@ -721,6 +794,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 +820,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'])