MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGProjects.py between versions 1.38 and 1.47.2.3

version 1.38, 2004/10/19 11:22:09	version 1.47.2.3, 2005/05/26 14:37:50
Line 1	Line 1
"""This contains the class MPIWG Projects	"""This contains the class MPIWG Projects
for organizing and maintaining the different projectspages	for organizing and maintaining the different project pages

"""	"""
from Products.PageTemplates.PageTemplateFile import PageTemplateFile	from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.PageTemplate import PageTemplate	from Products.PageTemplates.PageTemplate import PageTemplate
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate	from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder	from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
	from Products.ZCatalog.CatalogPathAwareness import CatalogAware
from Globals import package_home	from Globals import package_home
import urllib	import urllib
import MPIWGStaff	import MPIWGStaff
Line 13 import string	Line 14 import string
import re	import re
import os	import os
from types import *	from types import *
	import zLOG
import xmlhelper # Methoden zur Verwaltung der projekt xmls	import xmlhelper # Methoden zur Verwaltung der projekt xmls
from OFS.SimpleItem import SimpleItem	from OFS.SimpleItem import SimpleItem
from OFS.Folder import Folder	from OFS.Folder import Folder
	from Products.ZSQLMethods.SQL import SQLConnectionIDs

from bibliography import *	from bibliography import *
	import time

definedFields=['WEB_title','xdata_01','xdata_02','xdata_03','xdata_04','xdata_05','xdata_06','xdata_07','xdata_08','xdata_09','xdata_10','xdata_11','xdata_12','xdata_13','WEB_project_header','WEB_project_description','WEB_related_pub']	definedFields=['WEB_title','xdata_01','xdata_02','xdata_03','xdata_04','xdata_05','xdata_06','xdata_07','xdata_08','xdata_09','xdata_10','xdata_11','xdata_12','xdata_13','WEB_project_header','WEB_project_description','WEB_related_pub']

Line 33 def sortF(x,y):	Line 36 def sortF(x,y):
try:	try:
return cmp(str(x[1]),str(y[1]))	return cmp(str(x[1]),str(y[1]))
except:	except:
print "error",x[1],y[1]
return 0	return 0

def sortI(x,y):	def sortI(x,y):
Line 63 class MPIWGTemplate(ZopePageTemplate):	Line 66 class MPIWGTemplate(ZopePageTemplate):

meta_type="MPIWGTemplate"	meta_type="MPIWGTemplate"

	manage_options=ZopePageTemplate.manage_options+(
	{'label':'Change Weight','action':'changeWeightForm'},
	)

	def changeWeightForm(self):
	"""change weight form"""
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGTemplateChangeWeight.zpt')).__of__(self)
	return pt()

	def changeWeight(self,weight,RESPONSE=None):
	"""change weight"""
	self.weight=weight
	if RESPONSE is not None:
	RESPONSE.redirect('manage')


def __init__(self, id, text=None, content_type=None,MPIWGType=None):	def __init__(self, id, text=None, content_type=None,MPIWGType=None):
self.id = str(id)	self.id = str(id)

Line 78 class MPIWGTemplate(ZopePageTemplate):	Line 97 class MPIWGTemplate(ZopePageTemplate):

"""change form"""	"""change form"""

	def isActive(self):
	"""teste ob ausgewaehlt"""
	if self.absolute_url()==self.REQUEST['URL']:
	return "aktiv"
	else:
	return ""

def manage_addMPIWGTemplateForm(self):	def manage_addMPIWGTemplateForm(self):
"""Form for adding"""	"""Form for adding"""
Line 87 def manage_addMPIWGTemplateForm(self):	Line 112 def manage_addMPIWGTemplateForm(self):
from urllib import quote	from urllib import quote


def manage_addMPIWGTemplate(self, MPIWGType,id, title=None,REQUEST=None):	def manage_addMPIWGTemplate(self, MPIWGType,id, title=None,weight=0,REQUEST=None):
"Add a Page Template with optional file content."	"Add a Page Template with optional file content."
if type(MPIWGType)==StringType:	if type(MPIWGType)==StringType:
MPIWGTypes=[MPIWGType]	MPIWGTypes=[MPIWGType]
Line 122 def manage_addMPIWGTemplate(self, MPIWGT	Line 147 def manage_addMPIWGTemplate(self, MPIWGT
except AttributeError:	except AttributeError:
u = REQUEST['URL1']	u = REQUEST['URL1']

	ob = getattr(self, id)
	ob.weight=weight

REQUEST.RESPONSE.redirect(u+'/manage_main')	REQUEST.RESPONSE.redirect(u+'/manage_main')
return ''	return ''
Line 141 class MPIWGRoot(ZSQLExtendFolder):	Line 168 class MPIWGRoot(ZSQLExtendFolder):
folders=['MPIWGProject','Folder','ECHO_Navigation']	folders=['MPIWGProject','Folder','ECHO_Navigation']
meta_type='MPIWGRoot'	meta_type='MPIWGRoot'

	def isNewCapital(self,text=None,reset=None):
	if reset:
	self.REQUEST['capital']="A"
	return True
	else:
	if len(text)>0 and not (text[0]==self.REQUEST['capital']):
	self.REQUEST['capital']=text[0]
	return True
	else:
	return False

	def subNav(self,id):
	"""return subnav elemente"""
	def sortWeight(x,y):
	x1=int(getattr(x[1],'weight','0'))
	y1=int(getattr(y[1],'weight','0'))
	return cmp(x1,y1)
	if hasattr(self,id):
	subs=self.ZopeFind(getattr(self,id),obj_metatypes=['MPIWGTemplate'])
	subs.sort(sortWeight)
	return subs
	else:
	return None
	def isActive(self,name):
	"""teste ob subnavigation aktiv"""
	for part in self.REQUEST['URL'].split("/"):
	if part==name:
	return True
	return False


def upDateSQL(self,fileName):	def upDateSQL(self,fileName):
"""updates SQL databases using fm.jar"""	"""updates SQL databases using fm.jar"""
fmJarPath=os.path.join(package_home(globals()), 'updateSQL/fm.jar')	fmJarPath=os.path.join(package_home(globals()), 'updateSQL/fm.jar')
xmlPath=os.path.join(package_home(globals()), "updateSQL/%s"%fileName)	xmlPath=os.path.join(package_home(globals()), "updateSQL/%s"%fileName)
	zLOG.LOG("MPIWG Web",zLOG.INFO,"java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath))
os.popen("java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath),"r").read()	ret=os.popen("java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,xmlPath),"r").read()
	zLOG.LOG("MPIWG Web",zLOG.INFO,"result convert: %s"%ret)
return 1	return 1

def patchProjects(self,RESPONSE):	def patchProjects(self,RESPONSE):
Line 160 class MPIWGRoot(ZSQLExtendFolder):	Line 218 class MPIWGRoot(ZSQLExtendFolder):

def replaceNotEmpty(self,format,field):	def replaceNotEmpty(self,format,field):
"""replace not empty"""	"""replace not empty"""
if field and (not field==''):	if field and (not field.lstrip()==''):
return format%field	return format%field
else:	else:
return ""	return ""


	def isActual(self,project):
	"""checke if project is actual"""
	actualTime=time.localtime()
	obj= project.getObject()

	if getattr(obj,'archiveTime',actualTime)< actualTime:
	return False
	else:
	return True

def redirectIndex_html(self,request):	def redirectIndex_html(self,request):
#return request['URL1']+'/index_html'	#return request['URL1']+'/index_html'

Line 286 class MPIWGRoot(ZSQLExtendFolder):	Line 354 class MPIWGRoot(ZSQLExtendFolder):
list[urllib.quote(personNormal)]=(personNormal,[project[1]])	list[urllib.quote(personNormal)]=(personNormal,[project[1]])

except:	except:
print "ERROR",project	zLOG.LOG("MPIWG Web (harvestHistoricalPerson)",zLOG.ERROR,"cannot annalyize: %s"%repr(project))


return list	return list

Line 317 class MPIWGRoot(ZSQLExtendFolder):	Line 386 class MPIWGRoot(ZSQLExtendFolder):

def showHistoricalPersons(self):	def showHistoricalPersons(self):
"""show persons"""	"""show persons"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/showHistoricalPersons').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','showHistoricalPersons')).__of__(self)
return pt()	return pt()


def editHistoricalPersonsForm(self):	def editHistoricalPersonsForm(self):
"""edit historical persons for consistency"""	"""edit historical persons for consistency"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/editHistoricalPersonsForm').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editHistoricalPersonsForm')).__of__(self)
return pt()	return pt()

def getProjectsByFieldContent(self,fieldName,fieldContentsEntry):	def getProjectsByFieldContent(self,fieldName,fieldContentsEntry):
Line 339 class MPIWGRoot(ZSQLExtendFolder):	Line 408 class MPIWGRoot(ZSQLExtendFolder):

def changeMPIWGRootForm(self):	def changeMPIWGRootForm(self):
"""edit"""	"""edit"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/changeMPIWGRootForm').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeMPIWGRootForm')).__of__(self)
return pt()	return pt()

def changeMPIWGRoot(self,title,disciplineList,themesList,RESPONSE=None):	def changeMPIWGRoot(self,title,disciplineList,themesList,connection_id,RESPONSE=None):
"""change"""	"""change"""
self.title=title	self.title=title
	self.connection_id=connection_id
self.disciplineList=disciplineList	self.disciplineList=disciplineList
self.themesList=themesList	self.themesList=themesList

Line 388 class MPIWGRoot(ZSQLExtendFolder):	Line 458 class MPIWGRoot(ZSQLExtendFolder):
ret.append(project)	ret.append(project)
return ret	return ret

def getProjectFields(self,fieldName,folder=None,sort=None):	def getProjectFields(self,fieldName,actual="yes",folder=None,sort=None):
"""getListofFieldNames"""	"""getListofFieldNames"""
ret=[]	ret=[]

objects=self.ZopeFind(self,obj_metatypes=['MPIWGProject'],search_sub=1)	objects=self.ZopeFind(self.projects,obj_metatypes=['MPIWGProject'],search_sub=0)


for object in objects:	for object in objects:
obj=object[1]	obj=object[1]

	if (not getattr(obj,'invisible',None)) and (obj.isActual()):
if fieldName=="WEB_title_or_short":	if fieldName=="WEB_title_or_short":

if len(obj.getContent('xdata_07'))<3: # hack weil z.Z. manchmal noch ein Trennzeichen ; oder , im Feld statt leer	if len(obj.getContent('xdata_07'))<3: # hack weil z.Z. manchmal noch ein Trennzeichen ; oder , im Feld statt leer
Line 435 class MPIWGRoot(ZSQLExtendFolder):	Line 507 class MPIWGRoot(ZSQLExtendFolder):

def importNamesForm(self):	def importNamesForm(self):
"""Form"""	"""Form"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/MPIWGNamesForm.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGNamesForm.zpt')).__of__(self)
return pt()	return pt()

def importNames(self,fileupload,folderName,RESPONSE=None):	def importNames(self,fileupload,folderName,RESPONSE=None):
Line 456 class MPIWGRoot(ZSQLExtendFolder):	Line 528 class MPIWGRoot(ZSQLExtendFolder):
project._setObject(splitted[0],newObj)	project._setObject(splitted[0],newObj)
#print "done:",splitted[0]	#print "done:",splitted[0]
except:	except:
print "not done:",splitted[0]	zLOG.LOG("MPIWG Web (importNames)",zLOG.INFO,"cannot import: %s"%splitted[0])


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

def updateHomepages(self,RESPONSE):	def updateHomepages(self,RESPONSE):
"""lege members an"""	"""lege members an"""

self.upDateSQL('personalwww.xml')	self.upDateSQL('personalwww.xml')
founds=self.ZSQLInlineSearch(_table='personal_www')	founds=self.ZSQLInlineSearch(_table='personal_www',publish_the_data='yes')
project=getattr(self,'members')	project=getattr(self,'members')
for found in founds:	for found in founds:

Line 478 class MPIWGRoot(ZSQLExtendFolder):	Line 552 class MPIWGRoot(ZSQLExtendFolder):
RESPONSE.write("<p>old:%s (%s,%s)</p>\n"%(found.username,found.name,found.vorname))	RESPONSE.write("<p>old:%s (%s,%s)</p>\n"%(found.username,found.name,found.vorname))


	#delete non existing


	foundUserNames=[x.username for x in founds]
	for member in self.ZopeFind(self,obj_metatypes=["MPIWGStaff"],search_sub=1):

	if member[1].getId() not in foundUserNames:
	member[1].aq_parent.manage_delObjects(ids=[member[1].getId()])
	RESPONSE.write("<p>deleted:%s</p>\n"%member[1].getId())
	try:
	self.MembersCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
	except:
	pass
	self.ProjectCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])


if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 520 class MPIWGRoot(ZSQLExtendFolder):	Line 609 class MPIWGRoot(ZSQLExtendFolder):
"""generate Tree from project list"""	"""generate Tree from project list"""
returnList=[]	returnList=[]
for project in self.getProjectFields('xdata_05',sort="int"): # get Projects sorted by xdata_05	for project in self.getProjectFields('xdata_05',sort="int"): # get Projects sorted by xdata_05

for idNr in project[1].split(";"): # more than one number	for idNr in project[1].split(";"): # more than one number
if not idNr=="":	if not idNr=="":
splittedId=idNr.split(".")	splittedId=idNr.split(".")
Line 532 class MPIWGRoot(ZSQLExtendFolder):	Line 622 class MPIWGRoot(ZSQLExtendFolder):

return returnList	return returnList

	def formatElementsAsList(self,elements):
	"""formatiere tree als liste"""

	actualDepth=0
	ret=""
	for element in elements:
	if (element[0]>actualDepth):
	#fuege soviele ul ein wie unterschied in tiefe
	if element[0]==1:
	ret+="""<div class="dept">\n"""
	else:
	for i in range(element[0]-actualDepth):
	ret+="</li>\n<li><ul>\n"

	actualDepth=element[0]

	elif (element[0]<actualDepth):
	#fuege soviele /ul ein wie unterschied in tiefe
	for i in range(-element[0]+actualDepth):
	ret+="<br><br></li></ul></li>\n"

	if element[0]==1:
	department=int(element[3].getContent('xdata_05'))-1

	ret+="""</div>\n"""
	ret+="""<div class="bildspalte"><img src="../grafik/dept%i.jpg" width="160" height="120" vspace="40"></div>
	<div class="dept">\n<ul>\n
	"""%department

	actualDepth=element[0]
	else:
	ret+="""</li>\n"""
	ret+="""<li>\n"""

	if actualDepth==1:
	departmentName={'1':'Department I','2':'Department II','3':'Department III', '4':'NWG','5':'NWG'}
	department=element[3].getContent('xdata_05')
	ret+="""<img src="../grafik/totop.gif" vspace="10" border="0"></a><br><a name="dept%s"></a>%s: """%(department,departmentName[department])

	ret+="""<a href="%s">%s</a>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
	return ret

def formatElementForOverview(self,element):	def formatElementForOverview(self,element):
"""format the element for output in overview"""	"""format the element for output in overview"""
Line 693 class MPIWGRoot(ZSQLExtendFolder):	Line 824 class MPIWGRoot(ZSQLExtendFolder):
ret=[]	ret=[]
splitNeu=[]	splitNeu=[]
if email:	if email:
#print "IIII:",self.getId()	print "IIII:",self.getId()
members=self.ZopeFind(self,obj_metatypes=['MPIWGStaff'],obj_ids=[email],search_sub=1)	members=self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff'],obj_ids=[email],search_sub=1)
name = members[0][1].title.decode('utf-8')	name = members[0][1].title.decode('utf-8')

y=name	y=name
Line 712 class MPIWGRoot(ZSQLExtendFolder):	Line 843 class MPIWGRoot(ZSQLExtendFolder):
proj2=[]	proj2=[]
for x in proj:	for x in proj:

	if not getattr(x.getObject(),'invisible',None):
if not((splitted[1]==" Christoph") and (splitted[0]=="Hoffmann") and (str(x.WEB_title).find('Einstein')>0)):	if not((splitted[1]==" Christoph") and (splitted[0]=="Hoffmann") and (str(x.WEB_title).find('Einstein')>0)):

#print repr(splitted[1]),repr(splitted[0]),repr(x.WEB_title)
proj2.append(x)	proj2.append(x)
# proj2.sort(sortP)
# ret.append((y,proj2))
else:	else:
proj2=[]	proj2=[]

Line 725 class MPIWGRoot(ZSQLExtendFolder):	Line 854 class MPIWGRoot(ZSQLExtendFolder):
if proj:	if proj:
names=[x.WEB_title for x in proj]	names=[x.WEB_title for x in proj]
for x in proj:	for x in proj:

if not x.WEB_title in names:	if not x.WEB_title in names:
proj2.append(x)	proj2.append(x)

Line 815 class MPIWGRoot(ZSQLExtendFolder):	Line 945 class MPIWGRoot(ZSQLExtendFolder):

def manage_addMPIWGRootForm(self):	def manage_addMPIWGRootForm(self):
"""form for adding the root"""	"""form for adding the root"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/addMPIWGRootForm.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMPIWGRootForm.zpt')).__of__(self)
return pt()	return pt()

def manage_addMPIWGRoot(self,id,title,RESPONSE=None):	def manage_addMPIWGRoot(self,id,title,connection_id="",RESPONSE=None):
"""add a root folder"""	"""add a root folder"""
newObj=MPIWGRoot(id,title)	newObj=MPIWGRoot(id,title)
self._setObject(id,newObj)	self._setObject(id,newObj)
	ob=getattr(self,id)
	setattr(ob,'connection_id',connection_id)
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')


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

meta_type='MPIWGProject'	meta_type='MPIWGProject'
	default_catalog='ProjectCatalog'

	def PrincipiaSearchSource(self):
	"""Return cataloguable key for ourselves."""
	return str(self)

	def versionHeader(self):
	"""version Header, gibt header text entsprechend der aktuellen version aus"""

	actualTime=time.localtime()
	retTXT="""<h2>This is an outdated version, for the actual version please refer to <a href="%s">%s</a></h2>"""
	s=self.aq_parent.absolute_url()
	#print getattr(self,'archiveTime',actualTime)
	if getattr(self,'archiveTime',actualTime)< actualTime:
	return retTXT%(s,s)
	else:
	return ""
	def isActual(self):
	"""gibt 1 zurueck wenn aktuell, 0 sonst"""
	actualTime=time.localtime()


	#print getattr(self,'archiveTime',actualTime)
	if getattr(self,'archiveTime',actualTime)< actualTime:
	return 0
	else:
	return 1

	def copyObjectToArchive(self):
	"""kopiere aktuelles objekt ins archiv"""
	cb=self.aq_parent.manage_copyObjects(self.getId())
	self.manage_pasteObjects(cb)
	actualTime=time.localtime()

	self.manage_renameObject(self.getId(),self.getId()+"_"+time.strftime("%Y%m%d%H%M%S",actualTime))
	obj=getattr(self,self.getId()+"_"+time.strftime("%Y%m%d%H%M%S",actualTime))
	obj.setArchiveTime(time.strftime("%Y%m%d%H%M%S",actualTime))
	ids=[x[0] for x in self.ZopeFind(obj,obj_metatypes=['MPIWGProject'])]
	obj.manage_delObjects(ids)

	def setArchiveTime(self,time):
	"""set Archive Time"""
	self.archiveTime=time[0:]

	def versionManageForm(self):
	"""version Manage form:currently only set to invisible"""
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_versionManageForm.zpt')).__of__(self)
	return pt()

	def versionManage(self,invisible=None,RESPONSE=None):
	"""version Manage form:currently only set to invisible"""
	self.invisible=invisible

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


def crossLinker(self):	def crossLinker(self):
Line 889 class MPIWGProject(Folder):	Line 1075 class MPIWGProject(Folder):
{'label':'Edit BasisInfo','action':'editMPIWGBasisForm'},	{'label':'Edit BasisInfo','action':'editMPIWGBasisForm'},
{'label':'Edit Publications','action':'editMPIWGRelatedPublicationsForm'},	{'label':'Edit Publications','action':'editMPIWGRelatedPublicationsForm'},
{'label':'Edit Themes & Disciplines','action':'editMPIWGDisciplinesThemesForm'},	{'label':'Edit Themes & Disciplines','action':'editMPIWGDisciplinesThemesForm'},
	{'label':'Versionmanager','action':'versionManageForm'},
)	)


	def checkDate(self,date):
	"""teste ob zum Zeitpunkt date eine andere version existierte"""


	def sortProjectsByTime(x,y):
	return cmp(x[1].archiveTime,y[1].archiveTime)

	finds=self.ZopeFind(self,obj_metatypes=['MPIWGProject'])
	if not finds:
	return self.absolute_url()
	else:
	finds.sort(sortProjectsByTime)

	for find in finds:
	if int(find[1].archiveTime) > int(date):
	return find[1].absolute_url()

	return self.absolute_url()



def index_html(self):	def index_html(self):
"""show homepage"""	"""show homepage"""

	if self.REQUEST.has_key('date') and self.REQUEST.SESSION.get('MPI_redirected',None)==None:
	self.REQUEST.SESSION['MPI_redirected']=1
	self.REQUEST.RESPONSE.redirect(self.checkDate(self.REQUEST['date']))
	else:
	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"])

if ext:	if ext:
return getattr(self,ext[0][1].getId())()	return getattr(self,ext[0][1].getId())()

pt=PageTemplateFile('Products/MPIWGWeb/zpt/project_main').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','project_main')).__of__(self)
return pt()	return pt()


Line 924 class MPIWGProject(Folder):	Line 1139 class MPIWGProject(Folder):
"""Inhalt des Feldes"""	"""Inhalt des Feldes"""

text=u''	text=u''
#print "FIELD",field
for x in getattr(self,field):	for x in getattr(self,field):
#print "HIHIIII"

try:	try:
text +=x.encode('utf-8')	text +=x
except:
try:
text =x.encode('utf-8')
except:	except:
text=x.decode('latin-1').encode('utf-8')	text = x



#delete separator (;) if is there is one
## try:
## print text, text[len(text)-1]
## except:
## print "error:",text
try:	try:
if text[len(text)-1]==";":	if text[len(text)-1]==";":
text=text[0:len(text)-1]	text=text[0:len(text)-1]


except:	except:
"""nothing"""	pass

	if text=='':
	text2=text
	else:
text2=re.sub(r';([^\s])','; \g<1>',text)	text2=re.sub(r';([^\s])','; \g<1>',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 958 class MPIWGProject(Folder):	Line 1170 class MPIWGProject(Folder):
#teste ob WEB_project_description und keine f�hrenden p tags	#teste ob WEB_project_description und keine f�hrenden p tags
if (len(text2)>4) and (not text2[0:3]=='<p>') and (field=='WEB_project_description'):	if (len(text2)>4) and (not text2[0:3]=='<p>') and (field=='WEB_project_description'):
return "<p>"+text2+"</p>"	return "<p>"+text2+"</p>"
#if text2=="Otto Sibum":
#text2="H. Otto Sibum"
return text2	return text2.encode('utf-8')

def show_html(self):	def show_html(self):
"""simple index"""	"""simple index"""
#return "HI"	#return "HI"
pt=PageTemplateFile('Products/MPIWGWeb/zpt/MPIWGProject_index.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_index.zpt')).__of__(self)
return pt()	return pt()

def editMPIWGProjectForm(self):	def editMPIWGProjectForm(self):
"""editform"""	"""editform"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/edit_MPIWGProject.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGProject.zpt')).__of__(self)
return pt()	return pt()

def editMPIWGProject(self,RESPONSE=None):	def editMPIWGProject(self,RESPONSE=None):
"""edit the project"""	"""edit the project and archive the old version"""

	self.copyObjectToArchive() # archive the object


#return self.REQUEST
for x in definedFields:	for x in definedFields:
if self.REQUEST.has_key(x):	if self.REQUEST.has_key(x):

setattr(self,x,[self.REQUEST[x].decode('utf-8')])	setattr(self,x,[self.REQUEST[x].decode('utf-8')])



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

def editMPIWGDisciplinesThemesForm(self):	def editMPIWGDisciplinesThemesForm(self):
"""edit the disciplines and themes Form"""	"""edit the disciplines and themes Form"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/edit_MPIWGDisciplinesThemes.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGDisciplinesThemes.zpt')).__of__(self)
return pt()	return pt()

def editMPIWGDisciplinesThemes(self,disciplines=None,themes=None,RESPONSE=None):	def editMPIWGDisciplinesThemes(self,disciplines=None,themes=None,RESPONSE=None):
Line 1013 class MPIWGProject(Folder):	Line 1229 class MPIWGProject(Folder):

def isChecked(self,wert,list):	def isChecked(self,wert,list):
"""check if wert is in ; seperated list"""	"""check if wert is in ; seperated list"""
print "W:",wert
print "L:",list,type(list)
#felder sind manchmnal als liste mit einem element definiert	#felder sind manchmnal als liste mit einem element definiert
if type(list) is StringType or UnicodeType:	if type(list) is StringType or UnicodeType:
splitted=list.split(";")	splitted=list.split(";")
else:	else:
splitted=list[0].split(";")	splitted=list[0].split(";")

print splitted
for x in splitted:	for x in splitted:
if (not x==u'') and x in wert:	if (not x==u'') and x in wert:
return 1	return 1
Line 1029 class MPIWGProject(Folder):	Line 1244 class MPIWGProject(Folder):

def editMPIWGBasisForm(self):	def editMPIWGBasisForm(self):
"""editform"""	"""editform"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/edit_MPIWGBasis.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasis.zpt')).__of__(self)
return pt()	return pt()
def editMPIWGRelatedPublicationsForm(self):	def editMPIWGRelatedPublicationsForm(self):
"""Edit related Publications"""	"""Edit related Publications"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/edit_MPIWGRelatedPublications.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGRelatedPublications.zpt')).__of__(self)
return pt()	return pt()


def loadNewFileForm(self):	def loadNewFileForm(self):
"""Neues XML-File einlesen"""	"""Neues XML-File einlesen"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/MPIWGProject_newfile.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','MPIWGProject_newfile.zpt')).__of__(self)
return pt()	return pt()

def loadNewFile(self,RESPONSE=None):	def loadNewFile(self,RESPONSE=None):
Line 1067 class MPIWGProject(Folder):	Line 1282 class MPIWGProject(Folder):

def manage_addMPIWGProjectForm(self):	def manage_addMPIWGProjectForm(self):
"""form for adding the project"""	"""form for adding the project"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/addMPIWGProjectForm.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMPIWGProjectForm.zpt')).__of__(self)
return pt()	return pt()

def manage_addMPIWGProject(self,id,RESPONSE=None):	def manage_addMPIWGProject(self,id,RESPONSE=None):
Line 1075 def manage_addMPIWGProject(self,id,RESPO	Line 1290 def manage_addMPIWGProject(self,id,RESPO
#print argv	#print argv
fileupload=self.REQUEST.get('fileupload',None)	fileupload=self.REQUEST.get('fileupload',None)
if fileupload:	if fileupload:
print fileupload
file_name=fileupload.filename	file_name=fileupload.filename
filedata=fileupload.read()	filedata=fileupload.read()

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

Removed from v.1.38
changed lines
	Added in v.1.47.2.3