MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

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

version 1.47.2.44, 2005/12/22 21:09:00	version 1.47.2.53, 2006/07/13 09:56:56
Line 270 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 765 class MPIWGRoot(ZSQLExtendFolder):	Line 778 class MPIWGRoot(ZSQLExtendFolder):

RESPONSE.setHeader('Content-type', 'text/html')	RESPONSE.setHeader('Content-type', 'text/html')
RESPONSE.write("<html><body>\n")	RESPONSE.write("<html><body>\n")
	RESPONSE.write("Update Institutsbibliography\n")
	ret=self.upDateSQL('personalwww.xml')
	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"	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)	dom = NonvalidatingReader.parseUri(url)
#fh=urllib.urlopen(url)	#fh=urllib.urlopen(url)
#dom=xml.dom.minidom.parse(fh)	#dom=xml.dom.minidom.parse(fh)

RESPONSE.write("got_xml_File\n")	RESPONSE.write("got_xml_File\n")


Line 826 class MPIWGRoot(ZSQLExtendFolder):	Line 843 class MPIWGRoot(ZSQLExtendFolder):
vorname,username,title,position,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'))	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')))
Line 852 class MPIWGRoot(ZSQLExtendFolder):	Line 869 class MPIWGRoot(ZSQLExtendFolder):

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

ret=obj.createNewDBEntry(publish_the_data,id,name,	ret=obj.createNewDBEntry(publish_the_data,id,name,
vorname,username,title,position,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)
if not ret[0]:	if not ret[0]:

RESPONSE.write("<p>Error: %s</p>\n"%repr(ret[1]))	RESPONSE.write("<p>Error: %s</p>\n"%repr(ret[1]))
Line 871 class MPIWGRoot(ZSQLExtendFolder):	Line 888 class MPIWGRoot(ZSQLExtendFolder):

#self.updatePublicationDB()	#self.updatePublicationDB()

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

return True	return True
Line 889 class MPIWGRoot(ZSQLExtendFolder):	Line 906 class MPIWGRoot(ZSQLExtendFolder):




if RESPONSE:	if RESPONSE:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

Line 933 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']):
if x[1].isPublished():
ret.append(x[1].title.decode('utf-8'))

ret.sort()	ret=[", ".join([proj.lastName, proj.firstName]).decode('utf-8') for proj in results]
#print ret

	ret.sort()
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 1030 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','6':'Research Network'}	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 1186 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 1413 class MPIWGProject(CatalogAware,Folder):	Line 1443 class MPIWGProject(CatalogAware,Folder):


def copyImageToMargin(self,RESPONSE=None):	def copyImageToMargin(self,RESPONSE=None):
#TODO: copy more than one image
"""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
url=self.absolute_url()+"/"+self.imageURL	url=self.absolute_url()+"/"+imageURL
#url=self.absolute_url()+"/"+filename	#url=self.absolute_url()+"/"+filename

try:#relative url	try:#relative url

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

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