MPIWGWeb/MPIWGStaff.py - diff

Return to MPIWGStaff.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGStaff.py between versions 1.10.2.71 and 1.10.2.80

version 1.10.2.71, 2009/09/30 17:08:40	version 1.10.2.80, 2012/01/09 10:36:48
Line 25 import logging	Line 25 import logging
import email	import email
import re	import re
from OFS.Cache import Cacheable	from OFS.Cache import Cacheable
	import urllib2

from MPIWGHelper import *	from MPIWGHelper import *
#ersetzt logging	#ersetzt logging
Line 33 def logger(txt,method,txt2):	Line 34 def logger(txt,method,txt2):
logging.info(txt+ txt2)	logging.info(txt+ txt2)

departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek"	departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek"
	coneService="http://127.0.0.1:8280/MetaDataManagerRestlet/cone/" # kann in MPIWGRoot konfiguriert werden.



Line 79 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 80 class MPIWGStaff(CatalogAware,ZSQLExtend
meta_type="MPIWGStaff"	meta_type="MPIWGStaff"
default_catalog='MembersCatalog'	default_catalog='MembersCatalog'
departmentList=departmentList	departmentList=departmentList
	_v_cone=None;
security=ClassSecurityInfo()	security=ClassSecurityInfo()

def redirect(self,RESPONSE,url):	def redirect(self,RESPONSE,url):
Line 97 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 99 class MPIWGStaff(CatalogAware,ZSQLExtend

def getKeyUTF8(self):	def getKeyUTF8(self):
"""get db_key utf8"""	"""get db_key utf8"""
	logging.debug("KEY - MPIWGStaff:"+self.getKey())
	logging.debug("KEY - MPIWGStaff:"+utf8ify(self.getKey()))

return utf8ify(self.getKey())	return utf8ify(self.getKey())

def setKey(self,key):	def setKey(self,key):
Line 236 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 241 class MPIWGStaff(CatalogAware,ZSQLExtend
"""publish the image??, default no"""	"""publish the image??, default no"""
return getattr(self,'publishImage','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"""	"""update image"""

if file and not(file.filename==""):	if file and not(file.filename==""):
Line 317 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 322 class MPIWGStaff(CatalogAware,ZSQLExtend
"""	"""
return self.id	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):	def harvest_page_old(self,context=None):
"""geharvestete seite = verschlankte version von members_main"""	"""geharvestete seite = verschlankte version von members_main"""
#pt = getTemplate(self, "harvest_members_main")	#pt = getTemplate(self, "harvest_members_main")
Line 336 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 358 class MPIWGStaff(CatalogAware,ZSQLExtend

return pt()	return pt()

def harvest_page(self):	def harvest_page(self,mode="normal"):
"""harvest"""	"""harvest"""

if not self.isPublished():	if not self.isPublished():
return ""	return
st = getattr(self.en.staff.members,self.getId()).index_html()	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

	return rendered

def index_html(self):

	def index_html(self,mode="normal"):
"""show homepage"""	"""show homepage"""

bound_names={}	bound_names={}
Line 371 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 401 class MPIWGStaff(CatalogAware,ZSQLExtend
return result	return result

# look for individual page	# look for individual page
	if self.hasObject("index.html"):
pt = getattr(self, "index.html")	pt = getattr(self, "index.html")
# else use template	# else use template
if not pt:	else:
	if mode=="slim":
	pt = getTemplate(self, "members_main_slim")
	else:
pt = getTemplate(self, "members_main")	pt = getTemplate(self, "members_main")
# Execute the template in a new security context.	# Execute the template in a new security context.
security.addContext(self)	security.addContext(self)
Line 455 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 489 class MPIWGStaff(CatalogAware,ZSQLExtend
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self)	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()	return pt()

mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt'))	mainEditFile=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff_main.zpt'))
Line 636 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 670 class MPIWGStaff(CatalogAware,ZSQLExtend
"""erzeugt ein automatisches Profil aus den alten Eintraegen CV, Current work, und research interests"""	"""erzeugt ein automatisches Profil aus den alten Eintraegen CV, Current work, und research interests"""

ret=""	ret=""
	#founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.getKeyUTF8())
founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.key)	founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.key)
if founds:	if founds:
ret="<p class=\"bio_section_header\">Research interests: </p><br/>"	ret="<p class=\"bio_section_header\">Research interests: </p><br/>"

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.10.2.71
changed lines
	Added in v.1.10.2.80