--- MPIWGWeb/MPIWGStaff.py 2009/02/18 15:42:00 1.10.2.65 +++ MPIWGWeb/MPIWGStaff.py 2012/12/07 10:12:56 1.10.2.87 @@ -25,6 +25,9 @@ import logging import email import re from OFS.Cache import Cacheable +import urllib2 +import transaction +import SrvTxtUtils from MPIWGHelper import * #ersetzt logging @@ -33,11 +36,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 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 @@ -51,8 +54,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: @@ -79,6 +82,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend meta_type="MPIWGStaff" default_catalog='MembersCatalog' departmentList=departmentList + #_v_cone=None; security=ClassSecurityInfo() def redirect(self,RESPONSE,url): @@ -97,15 +101,26 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getKeyUTF8(self): """get db_key utf8""" + logging.debug("KEY - MPIWGStaff 1:"+self.getKey()) + logging.debug("KEY - MPIWGStaff 2 :"+utf8ify(self.getKey())) + return utf8ify(self.getKey()) def setKey(self,key): """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() @@ -116,9 +131,12 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getConnectionObj(self): """returns connection id (from root)""" - root = self.getMPIWGRoot() - return root.getConnectionObj() - + 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() @@ -233,7 +251,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==""): @@ -314,6 +332,29 @@ 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 getattr(self,'_v_cone',None)==None: + try: + + 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: + self._v_cone="" + return "" + + return self._v_cone + + + + def harvest_page_old(self,context=None): """geharvestete seite = verschlankte version von members_main""" #pt = getTemplate(self, "harvest_members_main") @@ -333,14 +374,23 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return pt() - def harvest_page(self): + def harvest_page(self,mode="normal"): """harvest""" + logging.debug("AAAAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") 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) + + 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={} @@ -365,9 +415,17 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if result is not None: # Got a cached value. return result - - pt = getTemplate(self, "members_main") - # Execute the template in a new security context. + + # 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: @@ -431,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') @@ -447,7 +506,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')) @@ -576,7 +635,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 != "": @@ -628,6 +687,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="

Research interests:


" @@ -671,6 +731,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend self.ZSQLQuery(query%(self.ZSQLQuote(awards),oid)) + if RESPONSE: self.redirect(RESPONSE,"editAwards") @@ -704,7 +765,16 @@ class MPIWGStaff(CatalogAware,ZSQLExtend 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.getKeyUTF8(),USE_FORM="yes") + 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")