--- MPIWGWeb/MPIWGStaff.py 2012/01/09 10:36:48 1.10.2.80 +++ MPIWGWeb/MPIWGStaff.py 2012/12/07 10:12:56 1.10.2.87 @@ -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): @@ -99,8 +101,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getKeyUTF8(self): """get db_key utf8""" - logging.debug("KEY - MPIWGStaff:"+self.getKey()) - logging.debug("KEY - MPIWGStaff:"+utf8ify(self.getKey())) + logging.debug("KEY - MPIWGStaff 1:"+self.getKey()) + logging.debug("KEY - MPIWGStaff 2 :"+utf8ify(self.getKey())) return utf8ify(self.getKey()) @@ -108,9 +110,17 @@ class MPIWGStaff(CatalogAware,ZSQLExtend """set key""" self.key=key + def rmKey(self): + """rm""" + self.key=None + return "" + def getKey(self): """get database key""" - if hasattr(self,'key'): + + + if getattr(self,'key',None): + logging.debug("KEY - MPIWGStaff 4:"+self.key) #logging.error("SAVED KEY:%s"%self.key) return unicodify(self.key.lower()) #return self.key.lower() @@ -327,12 +337,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 +376,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 +385,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend #templates = getattr(self,'getHarvestCache',self.en.getHarvestCache)() rendered = st templates[self.absolute_url()]=rendered - + transaction.commit() return rendered @@ -473,7 +489,8 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.firstName=firstName if key: self.key = key - + + if RESPONSE is not None: self.redirect(RESPONSE,'manage_main') @@ -714,6 +731,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.ZSQLQuery(query%(self.ZSQLQuote(awards),oid)) + if RESPONSE: self.redirect(RESPONSE,"editAwards") @@ -748,6 +766,15 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return pt() else: self.ZSQLChange(argv,_table="personal_www",_identify="lower(key)=%s"%utf8ify(self.getKey().lower()),USE_FORM="yes") + # aendere auch dien enstsprechen infos in der instance + self.changeMPIWGStaff(argv['last_name'],argv['first_name']); + + + + self.reindex_object() + + + if RESPONSE: self.redirect(RESPONSE,"editMainData")