--- ECHO_content/ECHO_collection.py 2005/03/07 21:25:09 1.218 +++ ECHO_content/ECHO_collection.py 2005/06/09 08:34:49 1.224 @@ -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. @@ -263,9 +262,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 +1197,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 +1237,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 +1306,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 +1367,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'}, ) @@ -1530,7 +1530,7 @@ class ECHO_collection(Folder, Persistent ret="" argv=self.REQUEST.form - resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink']) + resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_movie','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink']) for resource in resources: try: @@ -1545,7 +1545,7 @@ class ECHO_collection(Folder, Persistent ret="" argv=self.REQUEST.form - resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource']) + resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_movie','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink']) for resource in resources: try: @@ -1554,7 +1554,22 @@ class ECHO_collection(Folder, Persistent except: pass return ret - + + def changeLabelsInCollection(self): + """change all lables of a collection""" + ret="" + argv=self.REQUEST.form + + resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_movie','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink']) + for resource in resources: + + try: + ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"
" + resource[1].label=argv[resource[1].getId()][0:] + except: + pass + return ret + def updateCollection(self,RESPONSE=None): """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner""" files=os.listdir(self.path) @@ -1776,20 +1791,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: @@ -1978,8 +1995,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(): @@ -2050,7 +2067,7 @@ class ECHO_collection(Folder, Persistent def getAllMapAreas(self): """Give list of coordinates""" - mapColTypes=['ECHO_collection','ECHO_resource'] + mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink'] areas=[] for entry in self.getSubCols(subColTypes=mapColTypes): object=entry @@ -2388,6 +2405,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" @@ -2673,23 +2695,6 @@ class ECHO_root(Folder,Persistent,Implic def renderingTypeSelector_HTML(self,selected=None): """give type selector""" - if not selected: - retStr="