MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGProjects.py between versions 1.47.2.29 and 1.47.2.43

version 1.47.2.29, 2005/10/13 18:00:36	version 1.47.2.43, 2005/12/22 20:33:45
Line 4 for organizing and maintaining the diffe	Line 4 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: 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 296 class MPIWGRoot(ZSQLExtendFolder):	Line 297 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 536 class MPIWGRoot(ZSQLExtendFolder):	Line 537 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 700 class MPIWGRoot(ZSQLExtendFolder):	Line 701 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 745 class MPIWGRoot(ZSQLExtendFolder):	Line 747 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 757 class MPIWGRoot(ZSQLExtendFolder):	Line 760 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"	url="http://itgroup.mpiwg-berlin.mpg.de:8050/FMPro?-db=personal-www&-format=-dso_xml&-lay=sql_export&-max=20000&name=Laubichler&-find"
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")


memberFolder=getattr(self,'members')	memberFolder=getattr(self,'members')
Line 782 class MPIWGRoot(ZSQLExtendFolder):	Line 787 class MPIWGRoot(ZSQLExtendFolder):
name=getTextFromNode(row.xpath('./dn:Name',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])	name=getTextFromNode(row.xpath('./dn:Name',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
vorname=getTextFromNode(row.xpath('./dn:Vorname',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])	vorname=getTextFromNode(row.xpath('./dn:Vorname',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
title=getTextFromNode(row.xpath('./dn:Title',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])	title=getTextFromNode(row.xpath('./dn:Title',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
	position=getTextFromNode(row.xpath('./dn:Position',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
e_mail=getTextFromNode(row.xpath('./dn:e_mail',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])	e_mail=getTextFromNode(row.xpath('./dn:e_mail',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
e_mail_p=getTextFromNode(row.xpath('./dn:e_mail_p',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])	e_mail_p=getTextFromNode(row.xpath('./dn:e_mail_p',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
date_from=getTextFromNode(row.xpath('./dn:Date_from',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])	date_from=getTextFromNode(row.xpath('./dn:Date_from',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])
Line 791 class MPIWGRoot(ZSQLExtendFolder):	Line 797 class MPIWGRoot(ZSQLExtendFolder):
funded_by=getTextFromNode(row.xpath('./dn:funded_by',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})[0])	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])	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])	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]	#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'})	cw=row.xpath('./dn:current_work/dn:DATA',explicitNss={'dn':'http://www.filemaker.com/fmpdsoresult'})
if cw:	if cw:
Line 810 class MPIWGRoot(ZSQLExtendFolder):	Line 816 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)
ret=obj.createNewDBEntry(publish_the_data,id,name,	ret=obj.createNewDBEntry(publish_the_data,id,name,
vorname,username,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)
RESPONSE.write("""<p>%s</p>"""%ret[1])	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])
Line 843 class MPIWGRoot(ZSQLExtendFolder):	Line 850 class MPIWGRoot(ZSQLExtendFolder):

obj=getattr(memberFolder,username)	obj=getattr(memberFolder,username)

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)	date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position)
	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)
	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()

	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 898 class MPIWGRoot(ZSQLExtendFolder):	Line 941 class MPIWGRoot(ZSQLExtendFolder):
# ret.append(x.title.decode('utf-8'))	# ret.append(x.title.decode('utf-8'))

for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):	for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):
	if x[1].isPublished():
ret.append(x[1].title.decode('utf-8'))	ret.append(x[1].title.decode('utf-8'))

ret.sort()	ret.sort()
Line 985 class MPIWGRoot(ZSQLExtendFolder):	Line 1029 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':'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 1003 class MPIWGRoot(ZSQLExtendFolder):	Line 1047 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 1125 class MPIWGRoot(ZSQLExtendFolder):	Line 1171 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 1366 class MPIWGProject(CatalogAware,Folder):	Line 1412 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')	self.getContent('WEB_project_description',filter='yes')

Line 1378 class MPIWGProject(CatalogAware,Folder):	Line 1425 class MPIWGProject(CatalogAware,Folder):

self.addImage(None,self.imagecap,filename=filename)	self.addImage(None,self.imagecap,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()+"/"+self.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 1876 class MPIWGProject(CatalogAware,Folder):	Line 1932 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 1886 class MPIWGProject(CatalogAware,Folder):	Line 1942 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 1895 class MPIWGProject(CatalogAware,Folder):	Line 1961 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 2003 class MPIWGProject(CatalogAware,Folder):	Line 2069 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 2013 class MPIWGProject(CatalogAware,Folder):	Line 2080 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.29
changed lines
	Added in v.1.47.2.43