MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGProjects.py between versions 1.47.2.66 and 1.47.2.70

version 1.47.2.66, 2006/11/08 21:04:23	version 1.47.2.70, 2007/03/23 14:16:48
Line 167 class MPIWGLink(SimpleItem):	Line 167 class MPIWGLink(SimpleItem):
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage')	RESPONSE.redirect('manage')

def index_html(self):	def index_html(self,**argv):
"""index"""	"""index"""



try:	try:
return self.getObj().pt_render(extra_context={'here':self})	return self.getObj().pt_render(extra_context={'here':self})
except:	except:
self.REQUEST.RESPONSE.redirect(self.getObj().absolute_url())	self.REQUEST.RESPONSE.redirect(self.getObj().absolute_url())



def manage_addMPIWGLinkForm(self):	def manage_addMPIWGLinkForm(self):
"""Form for adding link"""	"""Form for adding link"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddMPIWGLink.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddMPIWGLink.zpt')).__of__(self)
Line 298 class MPIWGRoot(ZSQLExtendFolder):	Line 301 class MPIWGRoot(ZSQLExtendFolder):
folders=['MPIWGProject','Folder','ECHO_Navigation']	folders=['MPIWGProject','Folder','ECHO_Navigation']
meta_type='MPIWGRoot'	meta_type='MPIWGRoot'


def harvestProjects(self):	def harvestProjects(self):
"""harvest"""	"""harvest"""
folder="/tmp"	folder="/tmp"
Line 1541 class MPIWGRoot(ZSQLExtendFolder):	Line 1545 class MPIWGRoot(ZSQLExtendFolder):


dh=getattr(self,'deletedHistoricalNames',{})	dh=getattr(self,'deletedHistoricalNames',{})

	if type(dh) is ListType:
	dh={}
if not dh.has_key(name):	if not dh.has_key(name):
dh=occurrances.split("\n")	dh[name]=occurrances.split("\n")
else:	else:
dh+=occurrances.split("\n")	dh[name]+=occurrances.split("\n")

self.deletedHistoricalNames=dh	self.deletedHistoricalNames=dh

Line 1718 class MPIWGProject(CatalogAware,Folder):	Line 1725 class MPIWGProject(CatalogAware,Folder):
for split in splitted[1:]:	for split in splitted[1:]:
tmp=split.split("</p>")	tmp=split.split("</p>")
#return repr(splitted[1])	#return repr(splitted[1])

try:	try:
imageURLs.append(tmp[0].split("\"")[1].encode('utf-8'))	imageURLs.append(tmp[0].split("\"")[1].encode('utf-8'))
except:	except:

	try:
imageURLs.append(tmp[0].split("src=")[1].split(" ")[0].encode('utf-8'))	imageURLs.append(tmp[0].split("src=")[1].split(" ")[0].encode('utf-8'))
	except:
	imageURLs.append("")

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

Line 1871 class MPIWGProject(CatalogAware,Folder):	Line 1883 class MPIWGProject(CatalogAware,Folder):

def getImages(self):	def getImages(self):
"""get all Images"""	"""get all Images"""

def sort_images(x,y):	def sort_images(x,y):
return cmp(getattr(x[1],'place',0),getattr(y[1],'place',0))	return cmp(getattr(x[1],'place',0),getattr(y[1],'place',0))


	if (getattr(self,'imageURL','')!='') or (getattr(self,'imagecap','')!='') :
	try:
	self.addImage(None,getattr(self,'imagecap',''),RESPONSE=None,filename=getattr(self,'imageURL',''))
	except:
	pass
	self.imageURL=''
	self.imagecap=''

images=self.ZopeFind(self,obj_metatypes=['MPIWGProject_image'])	images=self.ZopeFind(self,obj_metatypes=['MPIWGProject_image'])

images.sort(sort_images)	images.sort(sort_images)
Line 1904 class MPIWGProject(CatalogAware,Folder):	Line 1926 class MPIWGProject(CatalogAware,Folder):
else:	else:
return False	return False


def addImage(self,fileHd,caption,RESPONSE=None,filename=None):	def addImage(self,fileHd,caption,RESPONSE=None,filename=None):
"""add an MPIWG_Project_image"""	"""add an MPIWG_Project_image"""

Line 1920 class MPIWGProject(CatalogAware,Folder):	Line 1943 class MPIWGProject(CatalogAware,Folder):
obj.caption=caption[0:]	obj.caption=caption[0:]
obj.enabled=True;	obj.enabled=True;
obj.place=self.getLastImageNumber()+1	obj.place=self.getLastImageNumber()+1
	obj.id=filename

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manageImages')	RESPONSE.redirect('manageImages')
Line 2312 class MPIWGProject(CatalogAware,Folder):	Line 2336 class MPIWGProject(CatalogAware,Folder):
try:	try:
self.imageURL=tmp[0].split("\"")[1].encode('utf-8')	self.imageURL=tmp[0].split("\"")[1].encode('utf-8')
except:	except:
	try:
self.imageURL=tmp[0].split("src=")[1].split(" ")[0].encode('utf-8')	self.imageURL=tmp[0].split("src=")[1].split(" ")[0].encode('utf-8')
	except:
	self.imageURL=""

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

Line 2342 class MPIWGProject(CatalogAware,Folder):	Line 2369 class MPIWGProject(CatalogAware,Folder):

#filter image	#filter image

	text5=text5.lstrip().rstrip() #loescher leerzeichen und einzelndes br
	if (text5=="<br>") or (text5=="<br/>"):
	text5=""

return text5.encode('utf-8')	return text5.encode('utf-8')

Line 2462 class MPIWGProject(CatalogAware,Folder):	Line 2492 class MPIWGProject(CatalogAware,Folder):

setattr(self,x,[self.REQUEST[x].decode('utf-8')])	setattr(self,x,[self.REQUEST[x].decode('utf-8')])


	if self.REQUEST.has_key('historicalNames'):
self.en.changeHistoricalNames(self.getId(),self.REQUEST['historicalNames'].split("\n"))	self.en.changeHistoricalNames(self.getId(),self.REQUEST['historicalNames'].split("\n"))

if self.REQUEST.has_key('active'):	if self.REQUEST.has_key('active'):

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

Removed from v.1.47.2.66
changed lines
	Added in v.1.47.2.70