MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGProjects.py between versions 1.47.2.28 and 1.47.2.53

version 1.47.2.28, 2005/10/12 19:35:38	version 1.47.2.53, 2006/07/13 09:56:56
Line 3 for organizing and maintaining the diffe	Line 3 for organizing and maintaining the diffe

"""	"""
#TODO: mechanismus fur links to personen ueberarbeiten, da jetzt alle e_mails als members auftauchen unabhaengig vom status publish_the_data	#TODO: mechanismus fur links to personen ueberarbeiten, da jetzt alle e_mails als members auftauchen unabhaengig vom status publish_the_data
	#TODO: was passiert wenn aenderungen von jochen im filemaker nicht mit den aenderungen im sql uebereinstimmen
	#TODO: in einzelnen projecte steht als pfad auf die bilder noch wwwneu statt www

from Products.PageTemplates.PageTemplateFile import PageTemplateFile	from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.PageTemplate import PageTemplate	from Products.PageTemplates.PageTemplate import PageTemplate
Line 27 from bibliography import *	Line 29 from bibliography import *
import time	import time
import xml.dom.minidom	import xml.dom.minidom
import sys	import sys
	from Ft.Xml.XPath import Evaluate
	from Ft.Xml.XPath.Context import Context
	from Ft.Xml.Domlette import NonvalidatingReader,PrettyPrint, Print
	from Ft.Xml import EMPTY_NAMESPACE

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 264 class MPIWGRoot(ZSQLExtendFolder):	Line 270 class MPIWGRoot(ZSQLExtendFolder):
folders=['MPIWGProject','Folder','ECHO_Navigation']	folders=['MPIWGProject','Folder','ECHO_Navigation']
meta_type='MPIWGRoot'	meta_type='MPIWGRoot'

	def decode(self,str):
	"""decoder"""
	if not str:
	return ""
	if type(str) is StringType:
	try:
	return str.decode('utf-8')
	except:
	return str.decode('latin-1')
	else:

	return str

def versionHeaderEN(self):	def versionHeaderEN(self):
"""version header text"""	"""version header text"""

Line 291 class MPIWGRoot(ZSQLExtendFolder):	Line 310 class MPIWGRoot(ZSQLExtendFolder):
ids=[int(x.id[1:]) for x in founds]	ids=[int(x.id[1:]) for x in founds]
maximum=max(ids)	maximum=max(ids)

id_raw=self.ZSQLQuery("select nextval('id_raw_test')",debug=debug)	id_raw=self.ZSQLQuery("select nextval('id_raw')",debug=debug)

if id_raw:	if id_raw:
self.ZSQLQuery("drop sequence id_raw_test",debug=debug)	self.ZSQLQuery("drop sequence id_raw",debug=debug)

self.ZSQLQuery("create sequence id_raw_test start %i"%(maximum+1),debug=debug)	self.ZSQLQuery("create sequence id_raw start %i"%(maximum+1),debug=debug)


def queryLink(self,link):	def queryLink(self,link):
Line 531 class MPIWGRoot(ZSQLExtendFolder):	Line 550 class MPIWGRoot(ZSQLExtendFolder):
list[urllib.quote(personNormal)]=(personNormal,[project[1]])	list[urllib.quote(personNormal)]=(personNormal,[project[1]])

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


return list	return list
Line 695 class MPIWGRoot(ZSQLExtendFolder):	Line 714 class MPIWGRoot(ZSQLExtendFolder):


manage_options = Folder.manage_options+(	manage_options = Folder.manage_options+(
{'label':'Update Personal Homepages','action':'updateHomepages'},	{'label':'Update personal homepages','action':'updateHomepages'},
	{'label':'Reindex catalogs','action':'reindexCatalogs'},
{'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'},
)	)

def importNamesForm(self):	def importNamesForm(self):
Line 740 class MPIWGRoot(ZSQLExtendFolder):	Line 760 class MPIWGRoot(ZSQLExtendFolder):

for found in founds:	for found in founds:

if found.id_institutsbibliographie and (not found.id_institutsbibliographie ==""):	if found.id_institutsbibliographie and (not found.id_institutsbibliographie =="") and (not found.id_institutsbibliographie =="0"):

entries = self.ZSQLInlineSearch(_table="institutsbiblio",id=found.id_institutsbibliographie)	entries = self.ZSQLInlineSearch(_table="institutsbiblio",id=found.id_institutsbibliographie)
for entry in entries:	for entry in entries:
self.ZSQLChange(_table='publications',_identify='oid=%s' % found.oid,year=entry.year,referencetype=entry.reference_type)	self.ZSQLChange(_table='publications',_identify='oid=%s' % found.oid,year=entry.year,referencetype=entry.reference_type)
Line 752 class MPIWGRoot(ZSQLExtendFolder):	Line 773 class MPIWGRoot(ZSQLExtendFolder):

return True	return True

def updateHomepage_neu(self,RESPONSE=None):	def updateHomepages(self,RESPONSE=None):
""" update"""	""" update"""

	RESPONSE.setHeader('Content-type', 'text/html')
RESPONSE.write("<html><body>\n")	RESPONSE.write("<html><body>\n")
url="http://itgroup.mpiwg-berlin.mpg.de:8050/FMPro?-db=personal-www&-format=-dso_xml&-lay=sql_export&-max=10000&-findall"	RESPONSE.write("Update Institutsbibliography\n")
fh=urllib.urlopen(url)	ret=self.upDateSQL('personalwww.xml')
dom=xml.dom.minidom.parse(fh)	RESPONSE.write("done Insitutsbibliography:%s\n"%ret)
	url="http://itgroup.mpiwg-berlin.mpg.de:8050/FMPro?-db=personal-www&-format=-dso_xml&-lay=sql_export&-max=20000&-findall"
	dom = NonvalidatingReader.parseUri(url)
	#fh=urllib.urlopen(url)
	#dom=xml.dom.minidom.parse(fh)

	RESPONSE.write("got_xml_File\n")


memberFolder=getattr(self,'members')	memberFolder=getattr(self,'members')
members=memberFolder.ZopeFind(memberFolder,obj_metatypes=["MPIWGStaff"])	members=memberFolder.ZopeFind(memberFolder,obj_metatypes=["MPIWGStaff"])

memberList=[x[0] for x in members]	memberList=[x[0] for x in members]
	#print dom
for row in dom.getElementsByTagName('ROW'):	#ctx=Context(dom,processorNss={EMPTY_NAMESPACE:'http://www.filemaker.com/fmpdsoresult'})
username=getTextFromNode(row.getElementsByTagName('username')[0])	# Evaluate(u".//dn:ROW",contextNode=dom,explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
id=getTextFromNode(row.getElementsByTagName('ID')[0])	#print dom.xpath(u'.//dn:ROW',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
name=getTextFromNode(row.getElementsByTagName('Name')[0])	for row in dom.xpath(u'.//dn:ROW',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'}):
vorname=getTextFromNode(row.getElementsByTagName('Vorname')[0])
title=getTextFromNode(row.getElementsByTagName('Title')[0])	username=getTextFromNode(row.xpath('./dn:username',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
e_mail=getTextFromNode(row.getElementsByTagName('e_mail')[0])	id=getTextFromNode(row.xpath('./dn:ID',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
e_mail_p=getTextFromNode(row.getElementsByTagName('e_mail_p')[0])	name=getTextFromNode(row.xpath('./dn:Name',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
date_from=getTextFromNode(row.getElementsByTagName('Date_from')[0])	vorname=getTextFromNode(row.xpath('./dn:Vorname',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
date_to=getTextFromNode(row.getElementsByTagName('Date_to')[0])	title=getTextFromNode(row.xpath('./dn:Title',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
abteilung=getTextFromNode(row.getElementsByTagName('Abteilung')[0])	position=getTextFromNode(row.xpath('./dn:Position',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
heimat_inst=getTextFromNode(row.getElementsByTagName('heimat_inst')[0])	e_mail=getTextFromNode(row.xpath('./dn:e_mail',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
funded_by=getTextFromNode(row.getElementsByTagName('funded_by')[0])	e_mail_p=getTextFromNode(row.xpath('./dn:e_mail_p',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
e_mail2=getTextFromNode(row.getElementsByTagName('e_mail2')[0])	date_from=getTextFromNode(row.xpath('./dn:Date_from',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
publish_the_data=getTextFromNode(row.getElementsByTagName('publish_the_data')[0])	date_to=getTextFromNode(row.xpath('./dn:Date_to',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
	abteilung=getTextFromNode(row.xpath('./dn:Abteilung',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
cwNode=row.getElementsByTagName('current_work.current')[0]	heimat_inst=getTextFromNode(row.xpath('./dn:heimat_inst',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
cw=cwNode.getElementsByTagName('DATA')	funded_by=getTextFromNode(row.xpath('./dn:funded_by',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
	e_mail2=getTextFromNode(row.xpath('./dn:e_mail2',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
	publish_the_data=getTextFromNode(row.xpath('./dn:publish_the_data',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
	stay_at_mpiwg=getTextFromNode(row.xpath('./dn:stay_at_mpiwg',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
	#cwNode=row.xpath('./dn:current_work.current',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]
	cw=row.xpath('./dn:current_work/dn:DATA',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
if cw:	if cw:
txt=getTextFromNode(cw[0])	txt=getTextFromNode(cw[0])
else:	else:
txt=""	txt=""

cwNode=row.getElementsByTagName('current_work.publish')[0]	#cwNode=row.xpath('.//dn:current_work.publish',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0]
cw=cwNode.getElementsByTagName('DATA')	cw=row.xpath('./dn:current_work/dn:DATA',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})

if cw:	if cw:
txt_p=getTextFromNode(cw[0])	txt_p=getTextFromNode(cw[0])
else:	else:
Line 798 class MPIWGRoot(ZSQLExtendFolder):	Line 833 class MPIWGRoot(ZSQLExtendFolder):
project=getattr(self,'members')	project=getattr(self,'members')

if not (username in memberList):#neuer eintrag	if not (username in memberList):#neuer eintrag

try:	try:
newObj=MPIWGStaff.MPIWGStaff(str(username),name,vorname)	newObj=MPIWGStaff.MPIWGStaff(str(username),name.encode('utf-8'),vorname.encode('utf-8'))
memberFolder._setObject(str(username),newObj)	memberFolder._setObject(str(username),newObj)
RESPONSE.write("<p>new:%s</p>\n"%username.encode('utf-8'))	RESPONSE.write("<p>new:%s</p>\n"%username.encode('utf-8'))
obj=getattr(memberFolder,username)	obj=getattr(memberFolder,username)
obj.createNewDBEntry(publish_the_data,id,name,	ret=obj.createNewDBEntry(publish_the_data,id,name,
vorname,title,e_mail,	vorname,username,title,position,e_mail,
e_mail_p,date_from,date_to,	e_mail_p,date_from,date_to,
abteilung,heimat_inst,funded_by,	abteilung,heimat_inst,funded_by,
e_mail2,txt,txt_p)	e_mail2,txt,txt_p,stay_at_mpiwg)
	RESPONSE.write("""<p>%s</p>"""%ret[1].encode('utf-8'))
except:	except:
RESPONSE.write("<p>ERROR:%s %s %s</p>\n"%(username.encode('utf-8'),name.encode('utf-8'),vorname.encode('utf-8')))	RESPONSE.write("<p>ERROR:%s %s %s</p>\n"%(username.encode('utf-8'),name.encode('utf-8'),vorname.encode('utf-8')))
RESPONSE.write("<p> : %s %s"%sys.exc_info()[:2])	RESPONSE.write("<p> : %s %s"%sys.exc_info()[:2])
else:	else:
RESPONSE.write("<p>update:%s</p>\n"%username.encode('utf-8'))	RESPONSE.write("<p>update:%s</p>\n"%username.encode('utf-8'))
self.ZSQLChange(_table="personal_www",_identify="id=%s"%id,publish_the_data=publish_the_data,
	xquery=".//dn:ROW[dn:username='%s']"%username
	results=dom.xpath(xquery,explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
	if len(results)>1:
	RESPONSE.write("<p>WARNING (update): username %s not unique</p>\n"%username.encode('utf-8'))
	xquery=".//dn:ROW[dn:publish_the_data='yes' and dn:username='%s']"%username
	rd=dom.xpath(xquery,explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
	if len(rd)>1:#mehrere published
	RESPONSE.write("<p>ERROR (update): username %s not unique and more then one date set to be published</p>\n"%username.encode('utf-8'))
	# elif len(rd)==1:#nur einer published, kein published dann mache nichts
	# publish_the_data=getTextFromNode(rd[0].xpath('./dn:publish_the_data',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
	# date_from=getTextFromNode(rd[0].xpath('./dn:Date_from',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
	# date_to=getTextFromNode(rd[0].xpath('./dn:Date_to',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
	#

	obj=getattr(memberFolder,username)

	done= obj.updateDBEntry(DBid=id,publish_the_data=publish_the_data,
date_from=date_from,	date_from=date_from,
date_to=date_to)	date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position,abteilung=abteilung)
	if not done and (publish_the_data=='yes'):

	ret=obj.createNewDBEntry(publish_the_data,id,name,
	vorname,username,title,position,e_mail,
	e_mail_p,date_from,date_to,
	abteilung,heimat_inst,funded_by,
	e_mail2,txt,txt_p,stay_at_mpiwg)
	if not ret[0]:

	RESPONSE.write("<p>Error: %s</p>\n"%repr(ret[1]))
	else:
	RESPONSE.write("<p>New: %s</p>\n"%repr(ret[1]))

	#TODO: reindexCatlogs and updatePublications wieder einbaue
	#self.reindexCatalogs(RESPONSE)

	#self.updatePublicationDB()

	#self.ZSQLResetConnection()
	RESPONSE.write("<h2>Done</h2></body></html>")

return True	return True

def updateHomepages(self,RESPONSE):	def reindexCatalogs(self,RESPONSE=None):
"""lege members an"""	"""reindex members and project catalog"""


	try:
	self.MembersCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
	self.ProjectCatalog.manage_catalogReindex(self.REQUEST,RESPONSE,self.REQUEST['URL1'])
	except:
	zLOG.LOG("MPIWG Root (updatehomepage)",zLOG.WARNING," %s %s"%sys.exc_info()[:2])





	if RESPONSE:
	RESPONSE.redirect('manage_main')



	def updateHomepages_old(self,RESPONSE):
	"""lege members an, alte version vollstaendige kopie aller fm-dateien per fm.jar"""
self.upDateSQL('personalwww.xml')	self.upDateSQL('personalwww.xml')
founds=self.ZSQLInlineSearch(_table='personal_www',publish_the_data='yes')	founds=self.ZSQLInlineSearch(_table='personal_www',publish_the_data='yes')
project=getattr(self,'members')	project=getattr(self,'members')
Line 860 class MPIWGRoot(ZSQLExtendFolder):	Line 951 class MPIWGRoot(ZSQLExtendFolder):
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')


	# def getAllMembers(self,reset=None):
	# """give list of all members"""
	# ret=[]
	#
	#
	# if reset or (getattr(self,'_v_membersList',None) is None):
	# for member in self.members._objects:
	# if member['meta_type']=='MPIWGStaff':
	# memberObj=getattr(self.members,member['id'])
	# if memberObj.isPublished():
	# ret.append(memberObj.title.decode('utf-8'))
	#
	# ret.sort()
	# self._v_membersList=ret[0:]
	# print ret
	#
	# return self._v_membersList

def getAllMembers(self):	def getAllMembers(self):
"""give list of all members"""	#ret=[]
ret=[]

#for x in self.members.objectValues('MPIWGStaff'):	results=self.MembersCatalog({'isPublished':True})
#print x.title
# ret.append(x.title.decode('utf-8'))

for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):	ret=[", ".join([proj.lastName, proj.firstName]).decode('utf-8') for proj in results]
ret.append(x[1].title.decode('utf-8'))

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

return ret	return ret

def printAllMembers(self):	def printAllMembers(self):
"""prin"""	"""print"""
members=self.getAllMembers()	members=self.getAllMembers()
ret=""	ret=""
for x in members:	for x in members:
Line 956 class MPIWGRoot(ZSQLExtendFolder):	Line 1058 class MPIWGRoot(ZSQLExtendFolder):
ret+="""<li>\n"""	ret+="""<li>\n"""

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

Line 974 class MPIWGRoot(ZSQLExtendFolder):	Line 1076 class MPIWGRoot(ZSQLExtendFolder):
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'))	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":	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">Ind. Research Group II: %s</a></h2>"""%(element[3].absolute_url()+"/index.html",element[3].getContent('WEB_title'))
	if element[3].getContent('xdata_05') == "6":
	return """<h2 class="hier"><a href="%s">Research Network "History of Scientific Objects": %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'))	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'))

Line 1096 class MPIWGRoot(ZSQLExtendFolder):	Line 1200 class MPIWGRoot(ZSQLExtendFolder):
except:	except:
proj=None	proj=None

if proj:	if proj and (proj[0].getObject().isPublished()):
if person =="Otto Sibum" : person="H. Otto Sibum"	if person =="Otto Sibum" : person="H. Otto Sibum"
if person =="Norton Wise" : person="M. Norton Wise"	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,person.encode('utf-8')))
Line 1110 class MPIWGRoot(ZSQLExtendFolder):	Line 1214 class MPIWGRoot(ZSQLExtendFolder):
"""give tuple member /projects"""	"""give tuple member /projects"""
ret=[]	ret=[]
members=self.getAllMembers()	members=self.getAllMembers()

#return str(members)	#return str(members)
for x in members:	for x in members:

ret+=self.getProjectsOfMember(name=x,date=date)	ret+=self.getProjectsOfMember(name=x,date=date)

return ret	return ret
Line 1338 class MPIWGProject(CatalogAware,Folder):	Line 1444 class MPIWGProject(CatalogAware,Folder):

def copyImageToMargin(self,RESPONSE=None):	def copyImageToMargin(self,RESPONSE=None):
"""copy inline images to marginal images"""	"""copy inline images to marginal images"""
self.getContent('WEB_project_description',filter='yes')

filename=self.imageURL.split("/")[-1]
	#getImages from WEB_project_description
	description=self.getContent('WEB_project_description')

	text2=description
	splitted=text2.split("""<p class="picture">""")

	imageURLs=[]
	imageCaptions=[]
	for split in splitted[1:]:
	tmp=split.split("</p>")
	#return repr(splitted[1])
	try:
	imageURLs.append(tmp[0].split("\"")[1].encode('utf-8'))
	except:
	imageURLs.append(tmp[0].split("src=")[1].split(" ")[0].encode('utf-8'))

	split2="</p>".join(tmp[1:])


	splitted=split2.split("""<p class="picturetitle">""")
	if len(splitted)>1:
	tmp=splitted[1].split("</p>")
	imageCaptions.append(tmp[0].encode('utf-8'))


	else:
	#keine caption

	imageCaptions.append("")







	#eintragen:
	for imageURL in imageURLs:
	filename=imageURL.split("/")[-1]
#lege neues images object an, mit leerem bild	#lege neues images object an, mit leerem bild

if self.ZopeFind(self,obj_ids=[filename]):	if self.ZopeFind(self,obj_ids=[filename]):
#existiert das bild schon, dann neueun filenamen	#existiert das bild schon, dann neuen filenamen
filename="project_image_"+filename	filename="project_image_"+filename

self.addImage(None,self.imagecap,filename=filename)	self.addImage(None,imageCaptions[imageURLs.index(imageURL)],filename=filename)
#hole die bilddaten aus der url	#hole die bilddaten aus der url
data=urllib.urlopen(self.absolute_url()+"/"+self.imageURL).read()	url=self.absolute_url()+"/"+imageURL
	#url=self.absolute_url()+"/"+filename

	try:#relative url
	data=urllib.urlopen(url).read()
	except:
	try:#absolute
	data=urllib.urlopen(self.imageURL).read()
	except:
	zLOG.LOG("MPIWG Project",zLOG.ERROR,"can't open: %s"%url)

obj=getattr(self,filename)	obj=getattr(self,filename)
obj.update_data(data)	obj.update_data(data)
Line 1847 class MPIWGProject(CatalogAware,Folder):	Line 2000 class MPIWGProject(CatalogAware,Folder):

return True	return True

security.declareProtected('View managment screens','edit')	security.declareProtected('View management screens','edit')
def edit(self,western=None):	def edit(self,western=None):
"""Edit pages"""	"""Edit pages"""
if western:	if western:
Line 1857 class MPIWGProject(CatalogAware,Folder):	Line 2010 class MPIWGProject(CatalogAware,Folder):
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGProjectNeu.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGProjectNeu.zpt')).__of__(self)
return pt()	return pt()

	edit_MPIWGProject_main = PageTemplateFile('zpt/edit_MPIWGProject_main', globals())

	def getPathStyle(self, path, selected, style=""):
	"""returns a string with the given style + 'sel' if path == selected."""

	if path == selected:
	return style + 'sel'
	else:
	return style

def preview(self,description):	def preview(self,description):
"""preview"""	"""preview"""
tmpPro=getattr(self,"previewTemplate",None)	tmpPro=getattr(self,"previewTemplate",None)
Line 1866 class MPIWGProject(CatalogAware,Folder):	Line 2029 class MPIWGProject(CatalogAware,Folder):
for field in definedFields:	for field in definedFields:
setattr(tmpPro,field,getattr(self,field))	setattr(tmpPro,field,getattr(self,field))
tmpPro.WEB_project_description=description[0:]	tmpPro.WEB_project_description=description[0:]
	tmpPro.invisible=True
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','previewFrame.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','previewFrame.zpt')).__of__(self)
return pt()	return pt()

Line 1974 class MPIWGProject(CatalogAware,Folder):	Line 2137 class MPIWGProject(CatalogAware,Folder):
splitted=[y.rstrip().lstrip() for y in splitted]	splitted=[y.rstrip().lstrip() for y in splitted]

for x in splitted:	for x in splitted:
	x=re.sub(r"[^A-z ]","",x)
if (not x==u'') and x in wert:	if (not x==u'') and x in wert:
return 1	return 1
return 0	return 0
Line 1984 class MPIWGProject(CatalogAware,Folder):	Line 2148 class MPIWGProject(CatalogAware,Folder):
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasisNeu.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasisNeu.zpt')).__of__(self)
return pt()	return pt()

	security.declareProtected('View management screens','editMPIWGBasisForm')
def editMPIWGBasisForm(self):	def editMPIWGBasisForm(self):
"""editform"""	"""editform"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasis.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGBasis.zpt')).__of__(self)
return pt()	return pt()

	security.declareProtected('View management screens','editMPIWGRelatedPublicationsForm')
def editMPIWGRelatedPublicationsForm(self):	def editMPIWGRelatedPublicationsForm(self):
"""Edit related Publications"""	"""Edit related Publications"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGRelatedPublications.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGRelatedPublications.zpt')).__of__(self)

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

Removed from v.1.47.2.28
changed lines
	Added in v.1.47.2.53