MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGProjects.py between versions 1.47.2.100 and 1.47.2.106

version 1.47.2.100, 2008/09/03 21:52:14	version 1.47.2.106, 2008/09/12 12:28:48
Line 22 from OFS.Image import Image	Line 22 from OFS.Image import Image
from AccessControl import ClassSecurityInfo	from AccessControl import ClassSecurityInfo
from bibliography import *	from bibliography import *
import time	import time
	from OFS.Cache import Cacheable
#import xml.dom.minidom	#import xml.dom.minidom
import sys	import sys
#from Ft.Xml.XPath import Evaluate	#from Ft.Xml.XPath import Evaluate
Line 111 class MPIWGProject_image(Image):	Line 112 class MPIWGProject_image(Image):
if RESPONSE:	if RESPONSE:
RESPONSE.redirect("../manageImages")	RESPONSE.redirect("../manageImages")

class MPIWGProject(CatalogAware,Folder):	class MPIWGProject(CatalogAware,Folder,Cacheable):
"""Class for Projects"""	"""Class for Projects"""


Line 369 class MPIWGProject(CatalogAware,Folder):	Line 370 class MPIWGProject(CatalogAware,Folder):

def deleteImage(self,id,RESPONSE=None):	def deleteImage(self,id,RESPONSE=None):
"""delete Image id"""	"""delete Image id"""
	try:
self.manage_delObjects([id])	self.manage_delObjects([id])
	except:
	logging.error("ERROR MPIWG: %s %s"%sys.exc_info()[0:2])
if RESPONSE:	if RESPONSE:
RESPONSE.redirect('manageImages')	RESPONSE.redirect('manageImages')

Line 573 class MPIWGProject(CatalogAware,Folder):	Line 577 class MPIWGProject(CatalogAware,Folder):
def isArchivedProject(self):	def isArchivedProject(self):
"""check if the project is archived"""	"""check if the project is archived"""

completed=getattr(self,'completedAt',0)	completed=self.getCompletedAt()

#completed leer	#completed leer
if completed=="" :	if completed=="" :
Line 610 class MPIWGProject(CatalogAware,Folder):	Line 614 class MPIWGProject(CatalogAware,Folder):
return True;	return True;
else:	else:
return False;	return False;

def getCompletedAt(self):	def getCompletedAt(self):
"""gibt das transformierte Datum zurueck, an dem das Projekt beendet wurde."""	"""gibt das transformierte Datum zurueck, an dem das Projekt beendet wurde."""
date=getattr(self,'completedAt','')	date=getattr(self,'completedAt','')
Line 617 class MPIWGProject(CatalogAware,Folder):	Line 622 class MPIWGProject(CatalogAware,Folder):
return self.reTransformDate(date);	return self.reTransformDate(date);
else:	else:
# test ob parent abgeschlossen ist	# test ob parent abgeschlossen ist
	try: #TODO: ersetzte try except durch vernuenftige abfrage
ct=self.getContexts(parents=self.getContent('xdata_05'),depth=1)	ct=self.getContexts(parents=self.getContent('xdata_05'),depth=1)
if (len(ct)>0): #is there are parent	if (len(ct)>0): #is there are parent

return ct[0][0].getCompletedAt()	return ct[0][0].getCompletedAt()
return '';	return '';
	except:
	return '';

def getStartedAt(self):	def getStartedAt(self):
"""gibt das transformierte Datum zurŸck, an dem Projekt begonnen wurde."""	"""gibt das transformierte Datum zurŸck, an dem Projekt begonnen wurde."""
Line 756 class MPIWGProject(CatalogAware,Folder):	Line 763 class MPIWGProject(CatalogAware,Folder):
self.REQUEST.SESSION['MPI_redirected']=None	self.REQUEST.SESSION['MPI_redirected']=None

#ext=self.ZopeFind(self.aq_parent,obj_ids=["project_main"])	#ext=self.ZopeFind(self.aq_parent,obj_ids=["project_main"])

ext=getattr(self,"project_main",None)	ext=getattr(self,"project_main",None)
if ext:	if ext:
return getattr(self,ext.getId())()	return getattr(self,ext.getId())()
Line 785 class MPIWGProject(CatalogAware,Folder):	Line 793 class MPIWGProject(CatalogAware,Folder):
def getContent(self,field,filter=None):	def getContent(self,field,filter=None):
"""Inhalt des Feldes"""	"""Inhalt des Feldes"""

	if field=="short_title":
	text = self.getContent("xdata_07")
	if text=="":
	text = self.getContent("WEB_title")
	return text

text=u''	text=u''

for x in getattr(self,field):	for x in getattr(self,field):
Line 804 class MPIWGProject(CatalogAware,Folder):	Line 818 class MPIWGProject(CatalogAware,Folder):
except:	except:
pass	pass

if text=='':	if text=='': ## wozu die folgenden Zeilen??
text2=text	text2=text
else:	else:
text2=re.sub(r';([^\s])','; \g<1>',text)	text2=re.sub(r';([^\s])','; \g<1>',text)

	if field=="WEB_project_description":##Jedenfalls darf letzteres nicht gemacht werden, falls normaler text
	text2=text

#teste ob ergebnis leer und header dann nehme title	#teste ob ergebnis leer und header dann nehme title

if (text2=='') and (field=='WEB_project_header'):	if (text2=='') and (field=='WEB_project_header'):
Line 1106 class MPIWGProject(CatalogAware,Folder):	Line 1123 class MPIWGProject(CatalogAware,Folder):
lastname=self.myCapitalize(lastname).encode('utf-8')	lastname=self.myCapitalize(lastname).encode('utf-8')
logging.info("Search: %s %s %s"%(name,repr(firstname),repr(lastname)))	logging.info("Search: %s %s %s"%(name,repr(firstname),repr(lastname)))
try:	try:
cataloggedNames=self.MembersCatalog({'firstName':firstname,'lastName':lastname})	cataloggedNames=self.MembersCatalog(firstName=firstname,lastName=lastname)
except:	except:
cataloggedNames=[]	cataloggedNames=[]
logging.error("ERROR: identifyNames %s %s"%sys.exc_info()[0:2])	logging.error("ERROR: identifyNames %s %s"%sys.exc_info()[0:2])

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

Removed from v.1.47.2.100
changed lines
	Added in v.1.47.2.106