--- MPIWGWeb/MPIWGStaff.py 2012/01/09 10:36:48 1.10.2.80 +++ MPIWGWeb/MPIWGStaff.py 2012/03/22 13:58:50 1.10.2.85 @@ -26,6 +26,8 @@ import email import re from OFS.Cache import Cacheable import urllib2 +import transaction +import SrvTxtUtils from MPIWGHelper import * #ersetzt logging @@ -80,7 +82,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend meta_type="MPIWGStaff" default_catalog='MembersCatalog' departmentList=departmentList - _v_cone=None; + #_v_cone=None; security=ClassSecurityInfo() def redirect(self,RESPONSE,url): @@ -327,12 +329,18 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.coneService=getattr(self, "coneServiceURL",coneService) logging.debug("coneservice:"+self.coneService) - if self._v_cone==None: + + if getattr(self,'_v_cone',None)==None: try: - cone = urllib2.urlopen(self.coneService+self.getPersonID()) - self._v_cone=cone.read() + + self._v_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 @@ -360,7 +368,7 @@ 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) @@ -369,7 +377,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend #templates = getattr(self,'getHarvestCache',self.en.getHarvestCache)() rendered = st templates[self.absolute_url()]=rendered - + transaction.commit() return rendered