--- MPIWGWeb/MPIWGStaff.py 2012/01/02 17:14:44 1.10.2.77 +++ MPIWGWeb/MPIWGStaff.py 2012/01/09 13:14:46 1.10.2.81 @@ -26,7 +26,7 @@ import email import re from OFS.Cache import Cacheable import urllib2 - +import transaction from MPIWGHelper import * #ersetzt logging def logger(txt,method,txt2): @@ -34,7 +34,7 @@ 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/" +coneService="http://127.0.0.1:8280/MetaDataManagerRestlet/cone/" # kann in MPIWGRoot konfiguriert werden. @@ -99,6 +99,9 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getKeyUTF8(self): """get db_key utf8""" + logging.debug("KEY - MPIWGStaff:"+self.getKey()) + logging.debug("KEY - MPIWGStaff:"+utf8ify(self.getKey())) + return utf8ify(self.getKey()) def setKey(self,key): @@ -321,9 +324,12 @@ class MPIWGStaff(CatalogAware,ZSQLExtend 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(coneService+self.getPersonID()) + cone = urllib2.urlopen(self.coneService+self.getPersonID()) self._v_cone=cone.read() except: return None @@ -352,15 +358,23 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return pt() - def harvest_page(self): + def harvest_page(self,mode="normal"): """harvest""" + if not self.isPublished(): - return "" - st = getattr(self.en.staff.members,self.getId()).index_html() - return st + return + st = getattr(self.en.staff.members,self.getId()).index_html(mode) + + templates = self.en.getHarvestCache() + #templates = getattr(self,'getHarvestCache',self.en.getHarvestCache)() + rendered = st + templates[self.absolute_url()]=rendered + transaction.commit() + return rendered + - def index_html(self): + def index_html(self,mode="normal"): """show homepage""" bound_names={} @@ -391,7 +405,10 @@ class MPIWGStaff(CatalogAware,ZSQLExtend pt = getattr(self, "index.html") # else use template else: - pt = getTemplate(self, "members_main") + 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)