--- MPIWGWeb/MPIWGStaff.py 2012/01/09 10:36:48 1.10.2.80 +++ MPIWGWeb/MPIWGStaff.py 2009/02/18 13:01:17 1.11 @@ -25,7 +25,6 @@ import logging import email import re from OFS.Cache import Cacheable -import urllib2 from MPIWGHelper import * #ersetzt logging @@ -34,11 +33,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,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=""): + +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=""): """lege person in der datenbank an""" if date_to=="": # wenn date_to leer @@ -52,8 +51,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,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") + 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") insert=[] for element in insertTuple: @@ -80,7 +79,6 @@ class MPIWGStaff(CatalogAware,ZSQLExtend meta_type="MPIWGStaff" default_catalog='MembersCatalog' departmentList=departmentList - _v_cone=None; security=ClassSecurityInfo() def redirect(self,RESPONSE,url): @@ -99,9 +97,6 @@ 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): @@ -121,12 +116,9 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getConnectionObj(self): """returns connection id (from root)""" - try: - root = self.getMPIWGRoot() - return root.getConnectionObj() - except: - return self.en.getConnectionObj() - + root = self.getMPIWGRoot() + return root.getConnectionObj() + def isPublished(self): """gib publications status aus der datenbank aus""" key=self.getKey() @@ -241,7 +233,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend """publish the image??, default no""" return getattr(self,'publishImage','no') - def updateImage(self,publishImage,file=None,rename=None,RESPONSE=None): + def updateImage(self,file,publishImage,rename=None,RESPONSE=None): """update image""" if file and not(file.filename==""): @@ -322,23 +314,6 @@ 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 self._v_cone==None: - try: - cone = urllib2.urlopen(self.coneService+self.getPersonID()) - self._v_cone=cone.read() - except: - return None - - return self._v_cone - - - - def harvest_page_old(self,context=None): """geharvestete seite = verschlankte version von members_main""" #pt = getTemplate(self, "harvest_members_main") @@ -358,23 +333,14 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return pt() - def harvest_page(self,mode="normal"): + def harvest_page(self): """harvest""" - if not self.isPublished(): - 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 - - return rendered - + return "" + return getattr(self.en.staff.members,self.getId()).index_html() - def index_html(self,mode="normal"): + def index_html(self): """show homepage""" bound_names={} @@ -399,17 +365,9 @@ class MPIWGStaff(CatalogAware,ZSQLExtend if result is not None: # Got a cached value. return result - - # 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. + + pt = getTemplate(self, "members_main") + # Execute the template in a new security context. security.addContext(self) try: @@ -489,7 +447,7 @@ class MPIWGStaff(CatalogAware,ZSQLExtend pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self) - logging.debug("XX:"+email.Utils.formatdate().split("-")[0]+'GMT') + logging.error("XX:"+email.Utils.formatdate().split("-")[0]+'GMT') return pt() mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt')) @@ -618,7 +576,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.getKeyUTF8()) + founds=self.ZSQLInlineSearchU(_table='personal_www',key=self.getKey()) html="""%s""" if founds.profile and founds.profile != "": @@ -670,7 +628,6 @@ 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:


" @@ -747,7 +704,7 @@ 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="lower(key)=%s"%utf8ify(self.getKey().lower()),USE_FORM="yes") + self.ZSQLChange(argv,_table="personal_www",_identify="key=%s"%self.getKeyUTF8(),USE_FORM="yes") if RESPONSE: self.redirect(RESPONSE,"editMainData")