MPIWGWeb/MPIWGStaff.py - diff

Return to MPIWGStaff.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGStaff.py between versions 1.10.2.30 and 1.10.2.43

version 1.10.2.30, 2006/11/08 16:36:38	version 1.10.2.43, 2008/08/20 09:40:57
Line 8 from Products.ZSQLExtend.ZSQLExtend impo	Line 8 from Products.ZSQLExtend.ZSQLExtend impo
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.ZCatalog.CatalogPathAwareness import CatalogAware	from Products.ZCatalog.CatalogPathAwareness import CatalogAware
	from Products.versionedFile.extVersionedFile import extVersionedFileFolder

import os	import os
import zLOG	import logging
import bibliography	import bibliography
from Globals import package_home	from Globals import package_home
from Products.PythonScripts.standard import sql_quote	from Products.PythonScripts.standard import sql_quote
from types import *	from types import *
from AccessControl import ClassSecurityInfo	from AccessControl import ClassSecurityInfo

import zLOG	import logging

	#ersetzt logging
	def logger(txt,method,txt2):
	"""logging"""
	logging.info(txt+ txt2)

departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek"	departmentList="Renn\nRheinberger\nDaston\nKlein\nSibum\nIT\nInstitut\nBibliothek"

Line 31 def getTemplate(self, tpName):	Line 38 def getTemplate(self, tpName):
assert(pt)	assert(pt)
return pt	return pt

class MPIWGStaff(CatalogAware,ZSQLExtendFolder):	def createNewDBEntry(self,publish_the_data,key,name,vorname,title,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by="",e_mail2="",txt="",txt_p="no",stay_at_mpiwg="",group="",web_object_created="no",current_work=""):
"""Staff"""

meta_type="MPIWGStaff"
default_catalog='MembersCatalog'
departmentList=departmentList
security=ClassSecurityInfo()

def getConnectionObj(self):#ueberschreibe connection id methode

return getattr(self.de,self.de.connection_id)

def isPublished(self):
"""gib publications status aus der datenbank aus"""
username=self.getId()
query="select count(publish_the_data) from personal_www where username='%s' and publish_the_data='yes'"%username

res = self.ZSQLQuery(query)

if res and res[0].count>0:
return True
else:
return False

def createNewDBEntry(self,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="no",stay_at_mpiwg=""):
"""lege person in der datenbank an"""	"""lege person in der datenbank an"""

if date_to=="": # wenn date_to leer	if date_to=="": # wenn date_to leer
date_to=="date_none"	date_to="date_none"

	if date_from=="": # wenn date_fromleer
	date_from="date_none"
msg=""	msg=""
#test ob id schon existiert	#test ob id schon existiert
if self.ZSQLQuery("select id from personal_www where id='%s'"%id):	if self.ZSQLQuery("select key from personal_www where key='%s'"%id):
return False,"ERROR:id %s already exists"%id	return False,"ERROR:key%s already exists"%key

if self.ZSQLQuery("select username from personal_www where username='%s' and publish_the_data='yes'"%username):

return False,"ERROR:username %s already exists and has data published, id=%s not added (running update again might solve this problem)"%(username,id)

if self.ZSQLQuery("select username from personal_www where username='%s' and not publish_the_data='yes'"%username):
msg="WARNING:username %s not unique but id=%s added"%(username,id)
#eintragen	#eintragen
columnlist="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,stay_at_mpiwg"	columnlist="""publish_the_data,key,last_name,first_name,title,status,e_mail,e_mail_p,date_from,date_to,department,home_inst,funded_by,e_mail2,date_stay_at_mpiwg,web_object_created,"group" """
insertTuple=(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,stay_at_mpiwg)	insertTuple=(publish_the_data,key,name,vorname,title,position,e_mail,e_mail_p,date_from,date_to,abteilung,heimat_inst,funded_by,e_mail2,stay_at_mpiwg,web_object_created,group)

insert=[]	insert=[]
for element in insertTuple:	for element in insertTuple:
if element=="date_none": # date_none eintrag wird zu null uebersetzt	if element=="date_none": # date_none eintrag wird zu null uebersetzt
insert.append('null')	insert.append('null')
else:	else:
insert.append("'%s'"%element)	insert.append("%s"%self.ZSQLQuote(element))

insertStr=",".join(insert)	insertStr=",".join(insert)
queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr)	queryStr="INSERT INTO personal_www (%s) VALUES (%s)"%(columnlist,insertStr)
self.ZSQLQuery("SET DATESTYLE TO 'German'")	self.ZSQLQuery("SET DATESTYLE TO 'German'")
self.ZSQLQuery(queryStr)	self.ZSQLQuery(queryStr)
	logging.info("QQQQ %s:"%queryStr)
#currentwork	#currentwork
if not (txt==""):	if not (current_work==""):
queryStr="INSERT INTO current_work (id_main,current,publish) VALUES ('%s','%s','%s')"%(id,txt,txt_p)	queryStr="INSERT INTO current_work (key_main,current,publish) VALUES ('%s',%s,'%s')"%(key,self.ZSQLQuote(current_work),"yes")

self.ZSQLQuery(queryStr)	self.ZSQLQuery(queryStr)

return True,msg	return True,msg
	class MPIWGStaff(CatalogAware,ZSQLExtendFolder):
	"""Staff"""

	meta_type="MPIWGStaff"
	default_catalog='MembersCatalog'
	departmentList=departmentList
	security=ClassSecurityInfo()

	def getKey(self):
	"""get database key"""
	if hasattr(self,'key'):
	return self.key.lower()

	#fuer alt faelle ohne key
	return (self.firstName+'_'+self.lastName).lower().replace(' ','')

	def getConnectionObj(self):#ueberschreibe connection id methode

	return getattr(self.de,self.de.connection_id)

	def isPublished(self):
	"""gib publications status aus der datenbank aus"""
	key=self.getKey()
	query="select count(publish_the_data) from personal_www where lower(key)='%s' and publish_the_data='yes'"%key

	res = self.ZSQLQuery(query)

	if res and res[0].count>0:
	return True
	else:
	return False



def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg="",position="",abteilung=""):	def updateDBEntry(self,publish_the_data,date_from,date_to,DBid=None,stay_at_mpiwg="",position="",abteilung=""):
"""zpddatedb"""	"""zpddatedb"""
Line 108 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 120 class MPIWGStaff(CatalogAware,ZSQLExtend


if test and (len(test)>0): #dataset exists	if test and (len(test)>0): #dataset exists
zLOG.LOG("MPIWG Web",zLOG.INFO,'UPDATE: _table="personal_www",_identify="id=%s"'%DBid+',publish_the_data=%s'%publish_the_data+',date_from=%s'%date_from+',date_to=%s'%date_to+',stay_at_mpiwg=%s'%stay_at_mpiwg+',position=%s'%position)	logger("MPIWG Web",logging.INFO,'UPDATE: _table="personal_www",_identify="id=%s"'%DBid+',publish_the_data=%s'%publish_the_data+',date_from=%s'%date_from+',date_to=%s'%date_to+',stay_at_mpiwg=%s'%stay_at_mpiwg+',position=%s'%position)

self.ZSQLChange(_table="personal_www",_identify="id=%s"%DBid,publish_the_data=publish_the_data,	self.ZSQLChange(_table="personal_www",_identify="id=%s"%DBid,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,abteilung=abteilung)	date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position,abteilung=abteilung)
Line 130 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 141 class MPIWGStaff(CatalogAware,ZSQLExtend
RESPONSE.redirect("editPublications")	RESPONSE.redirect("editPublications")


	def downloadCV(self,RESPONSE):
	"""download cv file"""
	ob=self._getOb("downloadableFiles")._getOb("cv.pdf")

	RESPONSE.redirect(ob.absolute_url()+"/download")

	def getLastUpdateCV(self):
	"""getDate of Last Update"""
	try:
	ob=self._getOb("downloadableFiles")._getOb("cv.pdf")
	return ob.getLastChangeDate()
	except:
	return "No file yet!"
	def getLastUpdatePublications(self):
	"""getDate of Last Update"""
	try:
	ob=self._getOb("downloadableFiles")._getOb("publications.pdf")
	return ob.getLastChangeDate()
	except:
	return "No file yet!"
	def downloadPublications(self,RESPONSE):
	"""download publications"""
	ob=self._getOb("downloadableFiles")._getOb("publications.pdf")

	RESPONSE.redirect(ob.absolute_url()+"/download")

	def changeDownloads(self,cv_pdf=None,cv_publish=None,publications_pdf=None,publications_publish=None,RESPONSE=None):
	""""change the downloadable files"""

	if not hasattr(self,'downloadableFiles'):

	extFolder = extVersionedFileFolder()
	extFolder.id = "downloadableFiles"
	self._setObject(extFolder.id,extFolder)

	ob = self._getOb("downloadableFiles")

	if cv_publish:
	self.cv_publish=cv_publish

	if publications_publish:
	self.publications_publish=publications_publish

	if cv_pdf:
	if not hasattr(ob,"cv.pdf"):
	ob.addFile("",cv_pdf,newName="cv.pdf")

	else:
	cvFile = getattr(ob,"cv.pdf")
	cvFile.addContentObject("","",file=cv_pdf)

	if publications_pdf:
	if not hasattr(ob,"publications.pdf"):
	ob.addFile("",cv_pdf,newName="publications.pdf")

	else:
	cvFile = getattr(ob,"publications.pdf")
	cvFile.addContentObject("","",file=publications_pdf)

	if RESPONSE:
	RESPONSE.redirect(self.REQUEST['HTTP_REFERER'])


def getPublishImage(self):	def getPublishImage(self):
"""publish the image??, default no"""	"""publish the image??, default no"""
return getattr(self,'publishImage','no')	return getattr(self,'publishImage','no')
Line 139 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 213 class MPIWGStaff(CatalogAware,ZSQLExtend

if file and not(file.filename==""):	if file and not(file.filename==""):
if self.getImageObj():	if self.getImageObj():
self.getImageObj().updateImage(file,rename=None,RESPONSE=None)	self.getImageObj().updateImage(file,_rename=None,RESPONSE=None)
else:	else:
# create new image object	# create new image object
xp = file.filename.rfind('.')	xp = file.filename.rfind('.')
if xp > 0:	if xp > 0:
ext = file.filename[xp:]	ext = file.filename[xp:]
fn = self.getId()+ext	#fn = self.getId()+ext
zLOG.LOG("MPWIG STAFF", zLOG.INFO, "new filename: %s"%fn)	fn = self.getId()
	logger("MPWIG STAFF", logging.INFO, "new filename: %s"%fn)
self.getImageFolder().addImage2(file,fileName=fn)	self.getImageFolder().addImage2(file,fileName=fn)
else:	else:
zLOG.LOG("MPWIG STAFF", zLOG.ERROR, "uploaded filename %s has no extension!"%file.filename)	logger("MPWIG STAFF", logging.ERROR, "uploaded filename %s has no extension!"%file.filename)

self.publishImage=publishImage	self.publishImage=publishImage

Line 163 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 238 class MPIWGStaff(CatalogAware,ZSQLExtend
try:	try:
return self.getPhysicalRoot().www_neu.images.staff_images	return self.getPhysicalRoot().www_neu.images.staff_images
except:	except:
zLOG.LOG("MPWIG STAFF", zLOG.ERROR, "image folder not found:"," has to be add /www_neu/staff_images")	logger("MPWIG STAFF", logging.ERROR, "image folder not found: has to be add /www_neu/staff_images")
return None	return None

def getImageObj(self):	def getImageObj(self):
Line 199 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 274 class MPIWGStaff(CatalogAware,ZSQLExtend
{'label':'Change Publications Special','action':'changePublications_specialForm'},	{'label':'Change Publications Special','action':'changePublications_specialForm'},
)	)

def __init__(self,id, lastName,firstName):	def __init__(self,id, lastName,firstName,key):
"""init"""	"""init"""
self.id=id	self.id=id
self.title="%s, %s"%(lastName,firstName)	self.title=key
self.lastName=lastName	self.lastName=lastName
self.firstName=firstName	self.firstName=firstName
	self.key=key

	def getPersonID(self):
	"""gibt den ID fuer die Person zurueck"
	im Moment ist personID = id, i.e. e-mail
	"""
	return self.id

def harvest_page(self):	def harvest_page(self):
"""geharvestete seite = verschlankte version von members_main"""	"""geharvestete seite = verschlankte version von members_main"""
Line 256 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 338 class MPIWGStaff(CatalogAware,ZSQLExtend
return pt()	return pt()

security.declareProtected('View management screens','changeMPIWGStaff')	security.declareProtected('View management screens','changeMPIWGStaff')
def changeMPIWGStaff(self,lastName,firstName,RESPONSE=None):	def changeMPIWGStaff(self,lastName,firstName,key=None,RESPONSE=None):
"""change it"""	"""change it"""
self.title="%s, %s"%(lastName,firstName)	self.title="%s, %s"%(lastName,firstName)
self.lastName=lastName	self.lastName=lastName
self.firstName=firstName	self.firstName=firstName
	if key:
	self.key = key

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 269 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 353 class MPIWGStaff(CatalogAware,ZSQLExtend
def edit(self):	def edit(self):
"""Edit the pages"""	"""Edit the pages"""
#TODO: zusammenspiel mit apache, redirect auf 18080 rausnehmen bzw. zumindest verallgemeinern	#TODO: zusammenspiel mit apache, redirect auf 18080 rausnehmen bzw. zumindest verallgemeinern
if self.REQUEST['SERVER_URL']=="http://www.mpiwg-berlin.mpg.de":	#if self.REQUEST['SERVER_URL']=="http://www.mpiwg-berlin.mpg.de":
redURL="http://xserve04.mpiwg-berlin.mpg.de:18080/www_neu/de/mitarbeiter/members/%s/edit"%self.getId()	# redURL="http://xserve04.mpiwg-berlin.mpg.de:18080/www_neu/de/mitarbeiter/members/%s/edit"%self.getId()
	#
self.REQUEST.RESPONSE.redirect(redURL)	# self.REQUEST.RESPONSE.redirect(redURL)

pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMPIWGStaff.zpt')).__of__(self)
return pt()	return pt()
Line 287 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 371 class MPIWGStaff(CatalogAware,ZSQLExtend
else:	else:
return style	return style


security.declareProtected('View management screens','changeResearch')	security.declareProtected('View management screens','changeResearch')
def changeResearch(self,noredirect=None):	def changeResearch(self,noredirect=None):
"""change the research entries"""	"""change the research entries"""
newEntries={}	newEntries={}
id_main=self.REQUEST.form['id_main']	key_main=self.REQUEST.form['key_main']

mainfieldL=self.REQUEST.form['main_fields'].split(",")	mainfieldL=self.REQUEST.form['main_fields'].split(",")
mainfield={}	mainfield={}
Line 320 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 405 class MPIWGStaff(CatalogAware,ZSQLExtend
#new entries	#new entries
for newEntry in newEntries.keys():	for newEntry in newEntries.keys():
query="INSERT INTO %s "%newEntry	query="INSERT INTO %s "%newEntry
keys=['id_main']	keys=['key_main']
values=["'"+sql_quote(id_main)+"'"]	values=["'"+sql_quote(key_main)+"'"]
for key in newEntries[newEntry].keys():	for key in newEntries[newEntry].keys():
keys.append(key)	keys.append(key)
values.append("'"+sql_quote(newEntries[newEntry][key])+"'")	values.append("'"+sql_quote(newEntries[newEntry][key])+"'")
Line 354 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 439 class MPIWGStaff(CatalogAware,ZSQLExtend
if RESPONSE:	if RESPONSE:
RESPONSE.redirect("editCV")	RESPONSE.redirect("editCV")


	def getProfile(self):
	"""get the profile"""
	founds=self.ZSQLInlineSearchU(_table='personal_www',key=self.getKey())
	html="""<html><body>%s</body></html>"""
	if founds.profile and founds.profile != "":

	return html%founds.profile
	else:

	return html%self.generateProfileForPerson(founds)

	def editProfile(self,oid=None,RESPONSE=None, kupu=None, preview=None):
	"""edit Profile, new entry replaces CD, current work and research interests"""

	if (not oid):
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editProfile.zpt')).__of__(self)
	return pt()




	if preview:
	pass
	#TODO: not supported yet
	#kupu=preview
	# find content of body tags

	start=kupu.find("<body>")
	end=kupu.find("</body>")

	newcontent= kupu[start+6:end]




	if preview:
	#TODO: not supported yet
	if RESPONSE:
	RESPONSE.redirect("editProfile")

	#return self.preview(newcontent)

	query="UPDATE personal_www SET profile=%s WHERE oid='%s'"
	self.ZSQLQuery(query%(self.ZSQLQuote(newcontent),oid))
	logging.error("PROFILE:"+query%(self.ZSQLQuote(newcontent),oid))
	if RESPONSE:
	RESPONSE.redirect("editProfile")



	def generateProfileForPerson(self,person):
	"""erzeugt ein automatisches Profil aus den alten Eintraegen CV, Current work, und research interests"""

	ret=""
	founds=self.ZSQLInlineSearch(_table='research_interest',key_main=person.key)
	if founds:
	ret="Research interests: <br/><br/>"
	for found in self.sortPriority(founds):
	ret+=found.interest+"<br/>"

	founds=self.ZSQLInlineSearch(_table='current_work',key_main=person.key)
	if founds:
	ret="Current work: <br/><br/>"
	for found in self.sortPriority(founds):
	ret+=found.current+"<br/>"

	ret+="<br/>"
	ret+=self.formatAscii(person.cv)

	return ret
	security.declareProtected('View management screens','editDownloads')
	def editDownloads(self):
	"""editiere die Downloads von der Webseite"""

	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editDownloads.zpt')).__of__(self)
	return pt()

security.declareProtected('View management screens','editAwards')	security.declareProtected('View management screens','editAwards')
def editAwards(self,awards=None,oid=None,RESPONSE=None):	def editAwards(self,awards=None,oid=None,RESPONSE=None):
"""edit a awards"""	"""edit a awards"""
Line 390 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 553 class MPIWGStaff(CatalogAware,ZSQLExtend
return "\n".join(list)	return "\n".join(list)

security.declareProtected('View management screens','editMainData')	security.declareProtected('View management screens','editMainData')
def editMainData(self,REQUEST=None,RESPONSE=None,name=None,**argv):	def editMainData(self,REQUEST=None,RESPONSE=None):
"""edit main data"""	"""edit main data"""

	argv=REQUEST.form

if not name:	if not argv.has_key('last_name'):
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editMainData.zpt')).__of__(self)
return pt()	return pt()
else:	else:
print argv	self.ZSQLChange(argv,_table="personal_www",_identify="key=%s"%self.getKey(),USE_FORM="yes")
self.ZSQLChange(argv,_table="personal_www",_identify="id=%s"%self.getDBId(),USE_FORM="yes")
if RESPONSE:	if RESPONSE:
RESPONSE.redirect("editMainData")	RESPONSE.redirect("editMainData")

Line 425 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 588 class MPIWGStaff(CatalogAware,ZSQLExtend
bookId="b%06i" % newId	bookId="b%06i" % newId

self.ZSQLAdd(argv,_table="bibliography",reference_type=_docType,id=bookId)	self.ZSQLAdd(argv,_table="bibliography",reference_type=_docType,id=bookId)
self.ZSQLAdd(_table="publications",id_gen_bib=bookId,id_main=self.getDBId(),publish='yes')
	self.ZSQLAdd(_useRequest=False,_table="publications",id_gen_bib=bookId,key_main=self.getDBId(),publish='yes')
self.updatePublicationDB(personId=self.getDBId())	self.updatePublicationDB(personId=self.getDBId())


Line 465 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 629 class MPIWGStaff(CatalogAware,ZSQLExtend

def getSortingMode(self):	def getSortingMode(self):
"""get sorting mode"""	"""get sorting mode"""
return getattr(self,'sortingMode','priority')	mode=getattr(self,'sortingMode','priority')
	if mode=="year":
	return "year DESC"
	else:
	return mode

def integer(self,value):	def integer(self,value):
try:	try:
Line 502 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 670 class MPIWGStaff(CatalogAware,ZSQLExtend
if not (type(entries) is ListType):	if not (type(entries) is ListType):
entries=[entries]	entries=[entries]


for bibId in entries:	for bibId in entries:
query="INSERT INTO %s " % "publications"	query="INSERT INTO %s " % "publications"
query+="(id_main,id_institutsbibliographie,publish) "	query+="(key_main,id_institutsbibliographie,publish) "
query+="VALUES ('%s','%s','yes')" %(sql_quote(self.getDBId()),sql_quote(bibId))	query+="VALUES ('%s','%s','yes')" %(sql_quote(self.getKey()),sql_quote(bibId))

#self.ZSQLAdd(_table="publications",id_institutsbibliographie=bibId,id_main=self.getDBId(),publish='yes')	#self.ZSQLAdd(_table="publications",id_institutsbibliographie=bibId,id_main=self.getDBId(),publish='yes')
self.ZSQLQuery(query)	self.ZSQLQuery(query)

self.updatePublicationDB(personId=self.getDBId())	self.updatePublicationDB(personId=self.getKey())

if not noredirect:	if not noredirect:

Line 521 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 690 class MPIWGStaff(CatalogAware,ZSQLExtend

def getDBId(self):	def getDBId(self):
"""get id from the personal database"""	"""get id from the personal database"""
search=self.ZSQLInlineSearch(_table='personal_www',username=self.getId(),publish_the_data='yes')
if search:#name existiert und published, dann nimm diesen falls es mehrereeventuell nich publizierte datensaetze gibt.	#in der neuen version ist definitions gemaess der key der Datenbank gleich dem key im Object.
return search[0].id	# TODO: remove all occurences of getDBId and replaces it by getKey
else:#nicht publiziert dann nimm einen davon	return self.getKey()
search2=self.ZSQLInlineSearch(_table='personal_www',username=self.getId())
if search2:	# search=self.ZSQLInlineSearch(_table='personal_www',key=self.getKey(),publish_the_data='yes')
return search2[0].id	# if search:#name existiert und published, dann nimm diesen falls es mehrereeventuell nich publizierte datensaetze gibt.
else:	# return search[0].id
return None	# else:#nicht publiziert dann nimm einen davon
	# search2=self.ZSQLInlineSearch(_table='personal_www',username=self.getId())
	# if search2:
	# return search2[0].id
	# else:
	# return None



formatBiblHelp=bibliography.formatBiblHelp	formatBiblHelp=bibliography.formatBiblHelp

def sortBibliography(self,list,sortingMode=None):	def sortBibliography(self,list,sortingMode=None,max=None):
if not sortingMode:	if not sortingMode:
sortingMode=self.getSortingMode()	sortingMode=self.getSortingMode()

if sortingMode == "year":	if sortingMode == "year":
return self.sortYear(list)	l= self.sortYear(list)
else:	else:
return self.sortPriority(list)	l=self.sortPriority(list)

	if max:
	return l[0:min(len(l),max)]
	else:
	return l

def sortPriority(self,list):	def sortPriority(self,list):
def sort(x,y):	def sort(x,y):
Line 557 class MPIWGStaff(CatalogAware,ZSQLExtend	Line 736 class MPIWGStaff(CatalogAware,ZSQLExtend

return cmp(xInt,yInt)	return cmp(xInt,yInt)

	if not list:
	return []
tmp=[x for x in list]	tmp=[x for x in list]
tmp.sort(sort)	tmp.sort(sort)

return tmp	return tmp

def sortYear(self,list):	def sortYear(self,list):

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

Removed from v.1.10.2.30
changed lines
	Added in v.1.10.2.43