--- MPIWGWeb/MPIWGStaff.py 2012/01/09 07:33:30 1.10.2.79 +++ MPIWGWeb/MPIWGStaff.py 2012/03/22 13:44:54 1.10.2.84 @@ -26,6 +26,8 @@ import email import re from OFS.Cache import Cacheable import urllib2 +import transaction +import SrvTxtUtils from MPIWGHelper import * #ersetzt logging @@ -99,6 +101,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): @@ -326,10 +331,15 @@ class MPIWGStaff(CatalogAware,ZSQLExtend logging.debug("coneservice:"+self.coneService) if self._v_cone==None: try: - cone = urllib2.urlopen(self.coneService+self.getPersonID()) - self._v_cone=cone.read() + + self._v_cone=cone=SrvTxtUtils.getHttpData(self.coneService+self.getPersonID()) + #cone = urllib2.urlopen(self.coneService+self.getPersonID()) + #self._v_cone=cone.read() + if self._v_cone==None: + self._v_cone="" except: - return None + self._v_cone="" + return "" return self._v_cone @@ -357,10 +367,18 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def harvest_page(self,mode="normal"): """harvest""" + logging.debug("AAAAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") if not self.isPublished(): return st = getattr(self.en.staff.members,self.getId()).index_html(mode) - return st + + 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,mode="normal"):