--- ECHO_content/ECHO_collection.py 2005/06/09 08:34:49 1.224 +++ ECHO_content/ECHO_collection.py 2005/06/22 20:09:38 1.227 @@ -39,6 +39,7 @@ from Globals import Persistent, package_ from Acquisition import Implicit import urllib +import cgi import smtplib import time from Ft.Xml.Domlette import NonvalidatingReader @@ -1405,7 +1406,28 @@ class ECHO_link(ECHO_externalLink): return ECHO_basis.content_html(self,'link') else: return ECHO_basis.content_html(self,'collection') - + + def index_html(self): + """standard link""" + + splitted=self.link.split("?") + if len(splitted)>1: + params=cgi.parse_qs(splitted[1]) + + for x in params.keys(): + if type(params[x]) is ListType: + params[x]=params[x][0] + + + else: + params={} + + params['backLink']=self.aq_parent.absolute_url() + + self.REQUEST.SESSION['_ECHOLink']=splitted[0]+"?"+urllib.urlencode(params) + + return self.REQUEST.RESPONSE.redirect(splitted[0]+"?"+urllib.urlencode(params)) + def manage_addECHO_linkForm(self): """Form for external Links""" pt=zptFile(self, 'zpt/AddECHO_linkForm.zpt') @@ -2065,9 +2087,9 @@ class ECHO_collection(Folder, Persistent """javascript""" return sendFile(self, 'js/hl_add.js', 'text/plain') - def getAllMapAreas(self): + def getAllMapAreas(self,mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink']): """Give list of coordinates""" - mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink'] + areas=[] for entry in self.getSubCols(subColTypes=mapColTypes): object=entry