--- ECHO_content/ECHO_collection.py 2005/03/16 15:52:08 1.219 +++ ECHO_content/ECHO_collection.py 2005/06/20 14:42:19 1.226 @@ -1,4 +1,3 @@ - """New version of the product started February, 8th. Without scientific classification, use content-type for further classification.""" """Echo collection provides the classes for the ECHO content web-site. @@ -40,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 @@ -263,9 +263,6 @@ class ECHO_resource(Folder,Persistent,EC getSubCols = ECHO_helpers.getSubCols - security.declareProtected('View','index_html') - - security.declareProtected('View','createPDF') def createPDF(self,RESPONSE=None,local=None,dpi=150): @@ -1201,7 +1198,9 @@ class ECHO_resource(Folder,Persistent,EC if not error=="": #Fehler beim Auslesen des Metafiles return "ERROR:",error - + if not self.contentType: + self.contentType=metadict['bib_type'].lower() + if not (metadict['bib_type'].lower()==self.contentType.lower()): self.REQUEST.SESSION['contentStorage']=metadict['bib_type'] self.REQUEST.SESSION['contentZope']=self.contentType @@ -1239,6 +1238,7 @@ class ECHO_resource(Folder,Persistent,EC return None + security.declareProtected('View','index_html') def index_html(self): """standard page""" pdf=self.checkRDF(self.link) @@ -1307,7 +1307,7 @@ def manage_addECHO_resourceForm(self): def manage_addECHO_resource(self,id,title,label,description="",responsible="",link="",metalink="",weight="",copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None): - """addaresource""" + """addresource""" newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords) @@ -1368,6 +1368,7 @@ class ECHO_externalLink(Folder,ECHO_basi manage_options = Folder.manage_options+( {'label':'Main Config','action':'ECHO_externalLink_config'}, + {'label':'Graphic Coords','action':'ECHO_graphicEntry'}, ) @@ -1405,7 +1406,27 @@ 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() + + + 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') @@ -1791,20 +1812,22 @@ class ECHO_collection(Folder, Persistent return "" - def addMovie(self,id,title,label,description,contentType,responsible,link,thumbUrl,rawFile,metalink,weight,credits=None,coords=None,RESPONSE=None): + def addMovie(self,id,title,label,description,contentType,responsible,link,thumbUrl,rawFile,lowresFile,metalink,weight,credits=None,coords=None,RESPONSE=None): """SSS""" print "we are here" #manage_addECHO_movie(self,id,title,label,description,responsible,link,thumbUrl,rawFile,metalink,weight,credits=None,coords=None,RESPONSE=None) if not hasattr(self,id): try: - manage_addECHO_movie(self,id,title,label,description,responsible,link,thumbUrl,rawFile,metalink,weight,credits=None,coords=None,RESPONSE=None) + manage_addECHO_movie(self,id,title,label,description,responsible,link,thumbUrl,rawFile,lowresFile,metalink,weight,credits=None,coords=None,RESPONSE=None) return "done" except: return None else: obj=getattr(self,id) - obj.changeECHO_movie_main(metalink,link,rawFile,thumbUrl,title,label,description,contentType,weight=weight) - + obj.changeECHO_movie_main(metalink,link,rawFile,lowresFile,thumbUrl,title,label,description,contentType,weight=weight) + + return "changed" + def addResource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None): """SSS""" try: @@ -1993,8 +2016,8 @@ class ECHO_collection(Folder, Persistent pt=zptFile(self, 'zpt/ECHO_content_overview.zpt') return pt() + security.declareProtected('View','index_html') - def index_html(self): """standard page""" if self.ZCacheable_isCachingEnabled(): @@ -2063,9 +2086,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'] + areas=[] for entry in self.getSubCols(subColTypes=mapColTypes): object=entry @@ -2403,6 +2426,11 @@ class ECHO_root(Folder,Persistent,Implic pt = zptObjectOrFile(self, 'content_overview_template') return pt + def mapstyle_css(self): + """send mapstyle.css""" + sendFile(self, 'html/ECHO_mapstyle.css', 'text/css') + + ###Cdli adds -> have to be removed def getTablet(self,item): #print "getTablet" @@ -2688,23 +2716,6 @@ class ECHO_root(Folder,Persistent,Implic def renderingTypeSelector_HTML(self,selected=None): """give type selector""" - if not selected: - retStr="