MPIWGWeb/MPIWGStaff.py - diff

Return to MPIWGStaff.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGStaff.py between versions 1.10.2.77 and 1.10.2.87

version 1.10.2.77, 2012/01/02 17:14:44	version 1.10.2.87, 2012/12/07 10:12:56
Line 26 import email	Line 26 import email
import re	import re
from OFS.Cache import Cacheable	from OFS.Cache import Cacheable
import urllib2	import urllib2
	import transaction
	import SrvTxtUtils

from MPIWGHelper import *	from MPIWGHelper import *
#ersetzt logging	#ersetzt logging
Line 34 def logger(txt,method,txt2):	Line 36 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/"	coneService="http://127.0.0.1:8280/MetaDataManagerRestlet/cone/" # kann in MPIWGRoot konfiguriert werden.



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

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

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

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

def setKey(self,key):	def setKey(self,key):
"""set key"""	"""set key"""
self.key=key	self.key=key

	def rmKey(self):
	"""rm"""
	self.key=None
	return ""

def getKey(self):	def getKey(self):
"""get database key"""	"""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)	#logging.error("SAVED KEY:%s"%self.key)
return unicodify(self.key.lower())	return unicodify(self.key.lower())
#return self.key.lower()	#return self.key.lower()
Line 321 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 334 class MPIWGStaff(CatalogAware,ZSQLExtend

def getConeUrl(self):	def getConeUrl(self):
"""gibt coneURL zurueck"""	"""gibt coneURL zurueck"""
if self._v_cone==None:
	self.coneService=getattr(self, "coneServiceURL",coneService)
	logging.debug("coneservice:"+self.coneService)

	if getattr(self,'_v_cone',None)==None:
try:	try:
cone = urllib2.urlopen(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:	except:
return None	self._v_cone=""
	return ""

return self._v_cone	return self._v_cone

Line 352 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 374 class MPIWGStaff(CatalogAware,ZSQLExtend

return pt()	return pt()

def harvest_page(self):	def harvest_page(self,mode="normal"):
"""harvest"""	"""harvest"""
	logging.debug("AAAAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
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
	transaction.commit()
	return rendered



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

bound_names={}	bound_names={}
Line 391 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 421 class MPIWGStaff(CatalogAware,ZSQLExtend
pt = getattr(self, "index.html")	pt = getattr(self, "index.html")
# else use template	# else use template
else:	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 457 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 490 class MPIWGStaff(CatalogAware,ZSQLExtend
if key:	if key:
self.key = key	self.key = key


if RESPONSE is not None:	if RESPONSE is not None:
self.redirect(RESPONSE,'manage_main')	self.redirect(RESPONSE,'manage_main')

Line 697 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 731 class MPIWGStaff(CatalogAware,ZSQLExtend

self.ZSQLQuery(query%(self.ZSQLQuote(awards),oid))	self.ZSQLQuery(query%(self.ZSQLQuote(awards),oid))


if RESPONSE:	if RESPONSE:
self.redirect(RESPONSE,"editAwards")	self.redirect(RESPONSE,"editAwards")

Line 731 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 766 class MPIWGStaff(CatalogAware,ZSQLExtend
return pt()	return pt()
else:	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="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:	if RESPONSE:
self.redirect(RESPONSE,"editMainData")	self.redirect(RESPONSE,"editMainData")

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

Removed from v.1.10.2.77
changed lines
	Added in v.1.10.2.87