MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGProjects.py between versions 1.47.2.108 and 1.47.2.109

version 1.47.2.108, 2008/10/23 10:02:09	version 1.47.2.109, 2009/02/18 15:42:00
Line 13 from Globals import package_home	Line 13 from Globals import package_home
import urllib	import urllib
import re	import re
import os	import os
	import email
from types import *	from types import *
import logging	import logging
import xmlhelper # Methoden zur Verwaltung der projekt xml	import xmlhelper # Methoden zur Verwaltung der projekt xml
Line 57 class MPIWGProject_publication(Folder):	Line 58 class MPIWGProject_publication(Folder):
"""publications object fuer project"""	"""publications object fuer project"""

meta_type="MPIWGProject_publication"	meta_type="MPIWGProject_publication"
	def redirect(self,RESPONSE,url):
	"""mache ein redirect mit einem angehaengten time stamp um ein reload zu erzwingen"""

	timeStamp=time.time()

	if url.find("?")>-1: #giebt es schon parameter
	addStr="&time=%s"
	else:
	addStr="?time=%s"

	RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT')
	logging.debug(email.Utils.formatdate()+' GMT')
	RESPONSE.redirect(url+addStr%timeStamp)

def editPublication(self,text=None,image1=None,image2=None,description=None,RESPONSE=None):	def editPublication(self,text=None,image1=None,image2=None,description=None,RESPONSE=None):
"""edit a publication"""	"""edit a publication"""
Line 85 class MPIWGProject_publication(Folder):	Line 99 class MPIWGProject_publication(Folder):


if RESPONSE:	if RESPONSE:
RESPONSE.redirect("../managePublications")	self.redirect(RESPONSE,"../managePublications")

class MPIWGProject_image(Image):	class MPIWGProject_image(Image):
"""Images for Projects"""	"""Images for Projects"""
Line 111 class MPIWGProject_image(Image):	Line 125 class MPIWGProject_image(Image):
self.caption=caption[0:]	self.caption=caption[0:]

if RESPONSE:	if RESPONSE:
RESPONSE.redirect("../manageImages")
	self.redirect(RESPONSE,"../manageImages")

class MPIWGProject(CatalogAware,Folder,Cacheable):	class MPIWGProject(CatalogAware,Folder,Cacheable):
"""Class for Projects"""	"""Class for Projects"""
Line 120 class MPIWGProject(CatalogAware,Folder,C	Line 135 class MPIWGProject(CatalogAware,Folder,C
security=ClassSecurityInfo()	security=ClassSecurityInfo()
meta_type='MPIWGProject'	meta_type='MPIWGProject'
default_catalog='ProjectCatalog'	default_catalog='ProjectCatalog'
	def redirect(self,RESPONSE,url):
	"""mache ein redirect mit einem angehaengten time stamp um ein reload zu erzwingen"""

	timeStamp=time.time()

	if url.find("?")>-1: #giebt es schon parameter
	addStr="&time=%s"
	else:
	addStr="?time=%s"

	RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT')
	logging.debug(email.Utils.formatdate()+' GMT')
	RESPONSE.redirect(url+addStr%timeStamp)

def decode(self,str):	def decode(self,str):
"""return unicode object"""	"""return unicode object"""
Line 149 class MPIWGProject(CatalogAware,Folder,C	Line 177 class MPIWGProject(CatalogAware,Folder,C
self.addPublication(pubSplit)	self.addPublication(pubSplit)

if RESPONSE:	if RESPONSE:
RESPONSE.redirect('managePublications')
	self.redirect(RESPONSE,'managePublications')


def copyImageToMargin(self,RESPONSE=None):	def copyImageToMargin(self,RESPONSE=None):
Line 218 class MPIWGProject(CatalogAware,Folder,C	Line 247 class MPIWGProject(CatalogAware,Folder,C
obj.update_data(data)	obj.update_data(data)

if RESPONSE:	if RESPONSE:
RESPONSE.redirect('manageImages')
	self.redirect(RESPONSE,'manageImages')

def manageImages(self,imageName=None,op=None):	def manageImages(self,imageName=None,op=None):
"""managage images"""	"""managage images"""
Line 297 class MPIWGProject(CatalogAware,Folder,C	Line 327 class MPIWGProject(CatalogAware,Folder,C


if RESPONSE:	if RESPONSE:
RESPONSE.redirect("managePublications")	self.redirect(RESPONSE,"managePublications")


def getPublications(self):	def getPublications(self):
"""get all Publications"""	"""get all Publications"""
Line 324 class MPIWGProject(CatalogAware,Folder,C	Line 355 class MPIWGProject(CatalogAware,Folder,C
obj.id=name	obj.id=name

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('managePublications')
	self.redirect(RESPONSE,'managePublications')


def getLastPublicationNumber(self):	def getLastPublicationNumber(self):
Line 339 class MPIWGProject(CatalogAware,Folder,C	Line 371 class MPIWGProject(CatalogAware,Folder,C
"""delete Publication id"""	"""delete Publication id"""
self.manage_delObjects([id])	self.manage_delObjects([id])
if RESPONSE:	if RESPONSE:
RESPONSE.redirect('managePublications')
	self.redirect(RESPONSE,'managePublications')

def getImages(self):	def getImages(self):
"""get all Images"""	"""get all Images"""
Line 376 class MPIWGProject(CatalogAware,Folder,C	Line 409 class MPIWGProject(CatalogAware,Folder,C
except:	except:
logging.error("ERROR MPIWG: %s %s"%sys.exc_info()[0:2])	logging.error("ERROR MPIWG: %s %s"%sys.exc_info()[0:2])
if RESPONSE:	if RESPONSE:
RESPONSE.redirect('manageImages')	self.redirect(RESPONSE,'manageImages')



def hasChildren(self,date=None,onlyActive=1,onlyArchived=1):	def hasChildren(self,date=None,onlyActive=1,onlyArchived=1):
Line 410 class MPIWGProject(CatalogAware,Folder,C	Line 444 class MPIWGProject(CatalogAware,Folder,C
obj.id=filename	obj.id=filename

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manageImages')
	self.redirect(RESPONSE,'manageImages')

def PrincipiaSearchSource(self):	def PrincipiaSearchSource(self):
"""Return cataloguable key for ourselves."""	"""Return cataloguable key for ourselves."""
Line 505 class MPIWGProject(CatalogAware,Folder,C	Line 540 class MPIWGProject(CatalogAware,Folder,C
self.invisible=invisible	self.invisible=invisible

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


def crossLinker(self):	def crossLinker(self):
Line 541 class MPIWGProject(CatalogAware,Folder,C	Line 577 class MPIWGProject(CatalogAware,Folder,C
self._setObject(id,newObj)	self._setObject(id,newObj)
#self.manage_addPageTemplate(id,title)	#self.manage_addPageTemplate(id,title)
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	self.redirect(RESPONSE,'manage_main')

def __init__(self, id, argv=None):	def __init__(self, id, argv=None):
"""initiere classe"""	"""initiere classe"""
Line 1295 class MPIWGProject(CatalogAware,Folder,C	Line 1331 class MPIWGProject(CatalogAware,Folder,C
self.xdata_10=""	self.xdata_10=""

if fromEdit and (RESPONSE is not None):	if fromEdit and (RESPONSE is not None):
RESPONSE.redirect('./editMPIWGDisciplinesThemesEditor')	self.redirect(RESPONSE,'./editMPIWGDisciplinesThemesEditor')

else:	else:
if RESPONSE is not None:	if RESPONSE is not None:

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

Removed from v.1.47.2.108
changed lines
	Added in v.1.47.2.109