MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGProjects.py between versions 1.11 and 1.40

version 1.11, 2004/07/06 16:49:36	version 1.40, 2004/10/21 14:28:55
Line 6 from Products.PageTemplates.PageTemplate	Line 6 from Products.PageTemplates.PageTemplate
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 Globals import package_home
	import urllib
import MPIWGStaff	import MPIWGStaff
import string	import string
import re	import re
	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
Line 28 def sortF(x,y):	Line 30 def sortF(x,y):
try:	try:
return cmp(x[1],y[1])	return cmp(x[1],y[1])
except:	except:
	try:
	return cmp(str(x[1]),str(y[1]))
	except:
	print "error",x[1],y[1]
return 0	return 0

def sortI(x,y):	def sortI(x,y):
Line 52 def sortI(x,y):	Line 58 def sortI(x,y):
except:	except:
return cmp(x[1],y[1])	return cmp(x[1],y[1])

	class MPIWGTemplate(ZopePageTemplate):
	"""Create a layout Template for different purposes"""

	meta_type="MPIWGTemplate"

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



	self.ZBindings_edit(self._default_bindings)
	if text is None:
	self._default_content_fn = os.path.join(package_home(globals()),
	'zpt/MPIWG_%s_template_standard.zpt'%MPIWGType)
	text = open(self._default_content_fn).read()
	self.pt_edit(text, content_type)


	"""change form"""


	def manage_addMPIWGTemplateForm(self):
	"""Form for adding"""
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddMPIWGTemplate.zpt')).__of__(self)
	return pt()

	from urllib import quote


	def manage_addMPIWGTemplate(self, MPIWGType,id, title=None,REQUEST=None):
	"Add a Page Template with optional file content."
	if type(MPIWGType)==StringType:
	MPIWGTypes=[MPIWGType]
	else:
	MPIWGTypes=MPIWGType

	for singleType in MPIWGTypes:


	if REQUEST is None:
	self._setObject(id, MPIWGTemplate(id, text,EchoType=singleType))
	ob = getattr(self, id)

	if title:
	ob.pt_setTitle(title)
	return ob
	else:
	file = REQUEST.form.get('file')
	headers = getattr(file, 'headers', None)
	if headers is None or not file.filename:
	zpt = MPIWGTemplate(id,MPIWGType=singleType)
	else:
	zpt = MPIWGTemplate(id, file, headers.get('content_type'))

	self._setObject(id, zpt)
	ob = getattr(self, id)
	if title:
	ob.pt_setTitle(title)

	try:
	u = self.DestinationURL()
	except AttributeError:
	u = REQUEST['URL1']


	REQUEST.RESPONSE.redirect(u+'/manage_main')
	return ''


class MPIWGRoot(ZSQLExtendFolder):	class MPIWGRoot(ZSQLExtendFolder):
"""Stammordner f�r den Web-Server"""	"""Stammordner f�r den Web-Server"""
Line 64 class MPIWGRoot(ZSQLExtendFolder):	Line 138 class MPIWGRoot(ZSQLExtendFolder):
'xdata_13':'Funding institutions','WEB_project_header':'WEB_project_header',	'xdata_13':'Funding institutions','WEB_project_header':'WEB_project_header',
'WEB_project_description':'WEB_project_description','WEB_related_pub':'WEB_related_pub'}	'WEB_project_description':'WEB_project_description','WEB_related_pub':'WEB_related_pub'}

folders=['MPIWGProject','Folder']	folders=['MPIWGProject','Folder','ECHO_Navigation']
meta_type='MPIWGRoot'	meta_type='MPIWGRoot'

	def upDateSQL(self,fileName):
	"""updates SQL databases using fm.jar"""
	fmJarPath=os.path.join(package_home(globals()), 'updateSQL/fm.jar')
	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))
	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

	def patchProjects(self,RESPONSE):
	"""patch"""
	projects=self.ZopeFind(self.projects,obj_metatypes=['MPIWGProject'])
	for project in projects:
	tmp=project[1].WEB_project_description[0].replace("/CD/projects/","")[0:]
	setattr(project[1],'WEB_project_description',[tmp[0:]])
	RESPONSE.write("<p>%s</p>\n"%project[0])

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==''):
Line 75 class MPIWGRoot(ZSQLExtendFolder):	Line 166 class MPIWGRoot(ZSQLExtendFolder):
return ""	return ""


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

	return urllib.urlopen(request['URL1']+'/index_html').read()


def formatBibliography(self,here,found):	def formatBibliography(self,here,found):
"""format"""	"""format"""
return formatBibliography(here,found)	return formatBibliography(here,found)

def getValue(self,field):	def getValue(self,fieldStr):
"""Inhalt des Feldes"""	"""Inhalt des Feldes"""

if type(field)==StringType:	if type(fieldStr)==StringType:
	field=fieldStr
	else:
	field=fieldStr[0]
try:	try:
if field[len(field)-1]==";":	if field[len(field)-1]==";":
field=field[0:len(text)-1]	field=field[0:len(field)-1]
except:	except:
"""nothing"""

	"""nothing"""
	field=re.sub(r';([^\s])','; \g<1>',field)
return field.encode('utf-8')	return field.encode('utf-8')

else:
return field[0].encode('utf-8')


def sortedNames(self,list):	def sortedNames(self,list):
"""sort names"""	"""sort names"""

def sortLastName(x,y):	def sortLastName(x_c,y_c):
	try:
	x=urllib.unquote(x_c).encode('utf-8','ignore')
	except:
	x=urllib.unquote(x_c)

	try:
	y=urllib.unquote(y_c).encode('utf-8','ignore')
	except:
	x=urllib.unquote(y_c)



try:	try:
last_x=x.split()[len(x.split())-1]	last_x=x.split()[len(x.split())-1]
last_y=y.split()[len(y.split())-1]	last_y=y.split()[len(y.split())-1]
Line 127 class MPIWGRoot(ZSQLExtendFolder):	Line 238 class MPIWGRoot(ZSQLExtendFolder):
self.id=id	self.id=id
self.title=title	self.title=title

	def urlQuote(self,str):
	"""quote"""
	return urllib.quote(str)

	def urlUnQuote(self,str):
	"""quote"""
	return urllib.unquote(str)

def harvestHistoricalPersons(self):	def harvestHistoricalPersons(self):
"""erstelle liste aller erwaehnten actors"""	"""erstelle liste aller erwaehnten actors"""

Line 145 class MPIWGRoot(ZSQLExtendFolder):	Line 264 class MPIWGRoot(ZSQLExtendFolder):
lg=len(project[1].xdata_03[0])-1	lg=len(project[1].xdata_03[0])-1

if (lg>1) and (project[1].xdata_03[0][lg]==";"):	if (lg>1) and (project[1].xdata_03[0][lg]==";"):
project[1].xdata_03[0]=project[1].xdata_03[0][0:lg-1]	project[1].xdata_03[0]=project[1].xdata_03[0][0:lg]



Line 155 class MPIWGRoot(ZSQLExtendFolder):	Line 274 class MPIWGRoot(ZSQLExtendFolder):
for person in project[1].xdata_03[0].split(";"):	for person in project[1].xdata_03[0].split(";"):
personNormal=normalize(person)	personNormal=normalize(person)
if personNormal in list.keys():	if personNormal in list.keys():
list[personNormal].append(project[1])	list[urllib.quote(personNormal)][1].append(project[1])
else:	else:
list[personNormal]=[project[1]]	list[urllib.quote(personNormal)]=(personNormal,[project[1]])
else: #guess , is sepeator	else: #guess , is sepeator
for person in project[1].xdata_03[0].split(","):	for person in project[1].xdata_03[0].split(","):
personNormal=normalize(person)	personNormal=normalize(person)
if personNormal in list.keys():	if urllib.quote(personNormal) in list.keys():
list[personNormal].append(project[1])	list[urllib.quote(personNormal)][1].append(project[1])
else:	else:
list[personNormal]=[project[1]]	list[urllib.quote(personNormal)]=(personNormal,[project[1]])

except:	except:
print "ERROR",project	print "ERROR",project
Line 176 class MPIWGRoot(ZSQLExtendFolder):	Line 295 class MPIWGRoot(ZSQLExtendFolder):
self.personDict={}	self.personDict={}
personDict=self.harvestHistoricalPersons()	personDict=self.harvestHistoricalPersons()
for person in personDict.keys():	for person in personDict.keys():
for project in personDict[person]:	for project in personDict[person][1]:
if person in self.personDict.keys():	if person in self.personDict.keys():
self.personDict[person].append((project.absolute_url(),project.WEB_title[0],project.xdata_01[0]))	self.personDict[person][1].append((project.absolute_url(),project.WEB_title[0],project.xdata_01[0]))
else:	else:
self.personDict[person]=[(project.absolute_url(),project.WEB_title[0],project.xdata_01[0])]	self.personDict[person]=(personDict[person][0],[(project.absolute_url(),project.WEB_title[0],project.xdata_01[0])])

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect("showHistoricalPersons")	RESPONSE.redirect("showHistoricalPersons")


	def getPersonDict(self,name):
	"""name von dict"""

	try:
	return self.personDict[name][0].encode('utf-8')
	except:
	return self.personDict[name][0]
	return self.personDict[name][0].decode('latin-1').encode('utf-8')


def showHistoricalPersons(self):	def showHistoricalPersons(self):
"""show persons"""	"""show persons"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/showHistoricalPersons').__of__(self)	pt=PageTemplateFile('Products/MPIWGWeb/zpt/showHistoricalPersons').__of__(self)
Line 251 class MPIWGRoot(ZSQLExtendFolder):	Line 380 class MPIWGRoot(ZSQLExtendFolder):
if re.match(searchStr,project[1]):	if re.match(searchStr,project[1]):

if depth:	if depth:
print "ho"
if int(depth)>=len(project[1].split("."))-len(childs.split(".")):	if int(depth)>=len(project[1].split("."))-len(childs.split(".")):

ret.append(project)	ret.append(project)
Line 262 class MPIWGRoot(ZSQLExtendFolder):	Line 391 class MPIWGRoot(ZSQLExtendFolder):
def getProjectFields(self,fieldName,folder=None,sort=None):	def getProjectFields(self,fieldName,folder=None,sort=None):
"""getListofFieldNames"""	"""getListofFieldNames"""
ret=[]	ret=[]
#print "FN",fieldName
if not folder:	objects=self.ZopeFind(self,obj_metatypes=['MPIWGProject'],search_sub=1)
folder=self
for object in folder.__dict__:
	for object in objects:
obj=getattr(folder,object)	obj=object[1]
if hasattr(obj,'meta_type'):
#print obj.meta_type
if obj.meta_type=='MPIWGProject':
if fieldName=="WEB_title_or_short":	if fieldName=="WEB_title_or_short":
#print "HI!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
#print len(obj.getContent('xdata_07'))
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
fieldNameTmp="WEB_title"	fieldNameTmp="WEB_title"
else:	else:
Line 283 class MPIWGRoot(ZSQLExtendFolder):	Line 408 class MPIWGRoot(ZSQLExtendFolder):

ret.append((obj,obj.getContent(fieldNameTmp)))	ret.append((obj,obj.getContent(fieldNameTmp)))

if obj.meta_type in self.folders:

ret += self.getProjectFields(fieldName,obj)

if sort=="int":	if sort=="int":
ret.sort(sortI)	ret.sort(sortI)
Line 305 class MPIWGRoot(ZSQLExtendFolder):	Line 427 class MPIWGRoot(ZSQLExtendFolder):


manage_options = Folder.manage_options+(	manage_options = Folder.manage_options+(
{'label':'Import Persons','action':'importNamesForm'},	{'label':'Update Personal Homepages','action':'updateHomepages'},
{'label':'Main config','action':'changeMPIWGRootForm'},	{'label':'Main config','action':'changeMPIWGRootForm'},
{'label':'Edit Historical Persons','action':'editHistoricalPersonsForm'},	{'label':'Edit Historical Persons','action':'editHistoricalPersonsForm'},
{'label':'Store Historical Persons','action':'storeHistoricalPersons'},	{'label':'Store Historical Persons','action':'storeHistoricalPersons'},
Line 325 class MPIWGRoot(ZSQLExtendFolder):	Line 447 class MPIWGRoot(ZSQLExtendFolder):


splitted=line.split(",")	splitted=line.split(",")
print splitted	# print splitted

if not (splitted[0]==""):	if not (splitted[0]==""):
newObj=MPIWGStaff.MPIWGStaff(splitted[0],splitted[1],splitted[2])	newObj=MPIWGStaff.MPIWGStaff(splitted[0],splitted[1],splitted[2])

try:	try:
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]	print "not done:",splitted[0]

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

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

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

	if not (found.e_mail==""):
	newObj=MPIWGStaff.MPIWGStaff(found.username,found.name,found.vorname)

	try:
	project._setObject(found.username,newObj)
	RESPONSE.write("<p>new:%s</p>\n"%found.username)
	except:
	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())

	self.MembersCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])



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


def getAllMembers(self):	def getAllMembers(self):
"""give list of all members"""	"""give list of all members"""
ret=[]	ret=[]
Line 350 class MPIWGRoot(ZSQLExtendFolder):	Line 508 class MPIWGRoot(ZSQLExtendFolder):
for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):	for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):
ret.append(x[1].title.decode('utf-8'))	ret.append(x[1].title.decode('utf-8'))

#ret.sort()	ret.sort()
#print ret	#print ret

return ret	return ret
Line 381 class MPIWGRoot(ZSQLExtendFolder):	Line 539 class MPIWGRoot(ZSQLExtendFolder):
splittedId=idNr.split(".")	splittedId=idNr.split(".")
depth=len(splittedId)	depth=len(splittedId)
nr=idNr	nr=idNr
title=project[0].WEB_title	#title=project[0].WEB_title
	title=[project[0].getContent('WEB_title')]
	#print title
returnList.append((depth,nr,title,project[0]))	returnList.append((depth,nr,title,project[0]))

return returnList	return returnList


	def formatElementForOverview(self,element):
	"""format the element for output in overview"""
	if element[0]==1: #department
	#print element[3].getContent('xdata_05')
	if element[3].getContent('xdata_05') == "4":
	return """<h2 class="hier"><a href="%s">Ind. Research Group I: %s</a></h2>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
	if element[3].getContent('xdata_05') == "5":
	return """<h2 class="hier"><a href="%s">Ind. Research Group II: %s</a></h2>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))

	return """<h2 class="hier"><a href="%s">Department %s: %s</a></h2>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('xdata_05'),element[3].getContent('WEB_title'))

	elif element[0]==2: #mainprojects
	return """<h3 class="hier"><a href="%s">%s</a></h3><p>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))

	elif element[0]==3:
	return """<p class="hier"><a href="%s">%s</a></p>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))


def changePosition(self,treeId,select,RESPONSE=None):	def changePosition(self,treeId,select,RESPONSE=None):
"""Change Postion Entry"""	"""Change Postion Entry"""
numbers=[]	numbers=[]
Line 445 class MPIWGRoot(ZSQLExtendFolder):	Line 623 class MPIWGRoot(ZSQLExtendFolder):



	def getRelativeUrlFromPerson(self,list):
	"""get urls to person list"""
	ret=[]
	persons=list.split(";")
	for person in persons:

	if len(person)>1: #nicht nur Trennzeichen
	splitted=person.split(",")
	if len(splitted)==1:
	splitted=person.split(" ")
	splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted]
	if splittedNew[0]=='':
	del splittedNew[0]
	search=string.join(splittedNew,' AND ')

	if not search=='':

	try:
	proj=self.MembersCatalog({'title':search})
	except:
	proj=None

	if proj:
	#ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url,person.encode('utf-8')))
	ret.append("<a href=%s >%s</a>"%('members/'+proj[0].id+'/index.html',person))
	else:
	#ret.append("%s"%person.encode('utf-8'))
	ret.append("%s"%person)
	return string.join(ret,";")


def getUrlFromPerson(self,list):	def getUrlFromPerson(self,list):
Line 456 class MPIWGRoot(ZSQLExtendFolder):	Line 663 class MPIWGRoot(ZSQLExtendFolder):
if len(person)>1: #nicht nur Trennzeichen	if len(person)>1: #nicht nur Trennzeichen
splitted=person.split(",")	splitted=person.split(",")
if len(splitted)==1:	if len(splitted)==1:
splitted=person.split(" ")	splitted=person.lstrip().rstrip().split(" ")
splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted]	splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted]
if splittedNew[0]=='':	if splittedNew[0]=='':
del splittedNew[0]	del splittedNew[0]
Line 470 class MPIWGRoot(ZSQLExtendFolder):	Line 677 class MPIWGRoot(ZSQLExtendFolder):
proj=None	proj=None

if proj:	if proj:
ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url,person))	if person =="Otto Sibum" : person="H. Otto Sibum"
	if person =="Norton Wise" : person="M. Norton Wise"
	#ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url,person.encode('utf-8')))
	ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url+"/index.html",person))
else:	else:
	#ret.append("%s"%person.encode('utf-8'))
ret.append("%s"%person)	ret.append("%s"%person)
return string.join(ret,";")	return string.join(ret,";")

Line 489 class MPIWGRoot(ZSQLExtendFolder):	Line 700 class MPIWGRoot(ZSQLExtendFolder):
"""get project of a member"""	"""get project of a member"""
def sortP(x,y):	def sortP(x,y):
"""sort by sorting number"""	"""sort by sorting number"""
	#print x.xdata_05,y.xdata_05
return cmp(x.xdata_05,y.xdata_05)	return cmp(x.WEB_title,y.WEB_title)


ret=[]	ret=[]
splitNeu=[]	splitNeu=[]
if email:	if email:
members=self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff'],obj_ids=[email])	#print "IIII:",self.getId()
	members=self.ZopeFind(self,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
splitted=y.split(",")	splitted=y.split(",")
for s in splitted:	#XXXX
splitNeu.append("\""+s+"\"")	splitNeu=["\'"+splitted[1]+" "+splitted[0]+"\'"]

	#for s in splitted:
	# splitNeu.append("\""+s+"\"")
search=string.join(splitNeu,' AND ')	search=string.join(splitNeu,' AND ')

proj=self.ProjectCatalog({'xdata_01':search})	proj=self.ProjectCatalog({'xdata_01':search})

if proj:	if proj:
proj2=[x for x in proj]	proj2=[]
proj2.sort(sortP)	for x in proj:
ret.append((y,proj2))
	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.sort(sortP)
	# ret.append((y,proj2))
	else:
	proj2=[]

proj=self.ProjectCatalog({'xdata_08':search})	proj=self.ProjectCatalog({'xdata_08':search})
if proj:	if proj:
proj2=[x for x in proj]	names=[x.WEB_title for x in proj]
	for x in proj:
	if not x.WEB_title in names:
	proj2.append(x)


proj2.sort(sortP)	proj2.sort(sortP)
ret.append((y,proj2))

	if len(proj2)>0:
	ret.append((y,proj2))

return ret	return ret

Line 525 class MPIWGRoot(ZSQLExtendFolder):	Line 755 class MPIWGRoot(ZSQLExtendFolder):

splitted=name.split(",")	splitted=name.split(",")
if len(splitted)==1:	if len(splitted)==1:
splitted=name.split(" ")	splitted=name.lstrip().rstrip().split(" ")
splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted]	splittedNew=[split.lstrip() for split in splitted]

if splittedNew[0]=='':	if splittedNew[0]=='':
del splittedNew[0]	del splittedNew[0]
search=string.join(splittedNew,' AND ')	search=string.join(splittedNew,' AND ')
Line 615 class MPIWGProject(Folder):	Line 846 class MPIWGProject(Folder):

meta_type='MPIWGProject'	meta_type='MPIWGProject'


def crossLinker(self):	def crossLinker(self):
"""experimental crosslinker"""	"""experimental crosslinker"""
splitted=self.WEB_project_description[0].split()	splitted=self.WEB_project_description[0].split()
Line 673 class MPIWGProject(Folder):	Line 905 class MPIWGProject(Folder):
{'label':'Edit Themes & Disciplines','action':'editMPIWGDisciplinesThemesForm'},	{'label':'Edit Themes & Disciplines','action':'editMPIWGDisciplinesThemesForm'},
)	)


	def index_html(self):
	"""show homepage"""
	ext=self.ZopeFind(self.aq_parent,obj_ids=["project_main"])

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

	pt=PageTemplateFile('Products/MPIWGWeb/zpt/project_main').__of__(self)
	return pt()


def getDataFields(self):	def getDataFields(self):
"""giveListofDatafields"""	"""giveListofDatafields"""
ret=[]	ret=[]
for x in range(1,14):	for x in range(1,14):
	if not x in [6,10,9]: # not used fields
ret.append('xdata_%02i'%x)	ret.append('xdata_%02i'%x)
return ret	return ret

Line 703 class MPIWGProject(Folder):	Line 948 class MPIWGProject(Folder):
try:	try:
text =x.encode('utf-8')	text =x.encode('utf-8')
except:	except:
text="ERROR"	text=x.decode('latin-1').encode('utf-8')

#delete separator (;) if is there is one	#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"""	"""nothing"""

return text	text2=re.sub(r';([^\s])','; \g<1>',text)
	#teste ob ergebnis leer und header dann nehme title

	if (text2=='') and (field=='WEB_project_header'):
	return self.getContent('WEB_title')

	#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'):
	return "<p>"+text2+"</p>"
	#if text2=="Otto Sibum":
	#text2="H. Otto Sibum"
	return text2

def show_html(self):	def show_html(self):
"""simple index"""	"""simple index"""
Line 826 def manage_addMPIWGProjectForm(self):	Line 1087 def manage_addMPIWGProjectForm(self):
def manage_addMPIWGProject(self,id,RESPONSE=None):	def manage_addMPIWGProject(self,id,RESPONSE=None):
"""method to add a project"""	"""method to add a project"""
#print argv	#print argv
if self.REQUEST.has_key('fileupload'):	fileupload=self.REQUEST.get('fileupload',None)
fileupload=self.REQUEST['fileupload']
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.11
changed lines
	Added in v.1.40