--- ECHO_content/ECHO_collection.py 2005/02/07 19:40:37 1.210
+++ ECHO_content/ECHO_collection.py 2005/06/09 08:34:49 1.224
@@ -64,7 +64,7 @@ import xml.dom.minidom
import ECHO_helpers
from ECHO_helpers import *
from ECHO_language import *
-
+from ECHO_movie import *
#regexp for extracting elements from xml
patternTXT=r"<\s*txt.*?>(.*?)"
@@ -153,8 +153,7 @@ class ECHO_layoutTemplate(ZopePageTempla
self.ZBindings_edit(self._default_bindings)
if text is None:
- self._default_content_fn = os.path.join(package_home(globals()),
- 'zpt/ECHO_%s_template_standard.zpt'%EchoType)
+ self._default_content_fn = os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%EchoType)
text = open(self._default_content_fn).read()
self.pt_edit(text, content_type)
@@ -212,10 +211,11 @@ class ECHO_fullText(ZopePageTemplate,ECH
def getPage(self,nr='1'):
"""get page n"""
- dom=xml.dom.minidom.parseString(self())
+ #return self().encode('latin-1','ignore')
+ dom=xml.dom.minidom.parseString(self().encode('utf-8','ignore'))
pages=dom.getElementsByTagName('page')
- return pages[int(nr)-1].toxml('utf-8')
+ return pages[int(nr)-1].toxml()
# Product registration and Add support
manage_addECHO_fullTextForm = PageTemplateFile(
@@ -262,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):
@@ -561,7 +558,7 @@ class ECHO_resource(Folder,Persistent,EC
startpage=self.createImageUrl()
params="startpage=%s"%startpage
- print 'http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))
+ #print 'http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))
ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))).read()
@@ -1200,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
@@ -1238,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)
@@ -1306,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)
@@ -1367,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'},
)
@@ -1411,7 +1412,7 @@ def manage_addECHO_linkForm(self):
return pt()
-def manage_addECHO_link(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None):
+def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,RESPONSE=None):
"""Add an external Link"""
newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)
@@ -1529,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:
@@ -1544,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:
@@ -1553,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)
@@ -1774,6 +1790,23 @@ class ECHO_collection(Folder, Persistent
except:
return ""
+
+ 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,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,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:
@@ -1870,7 +1903,7 @@ class ECHO_collection(Folder, Persistent
return ECHO_rerenderLinksMD(self,obj,types)
- def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag="",bgcolour=""):
+ def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour=""):
self.id = id
"""Festlegen der ID"""
@@ -1962,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():
@@ -2034,9 +2067,9 @@ 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(self,subColTypes=mapColTypes):
+ for entry in self.getSubCols(subColTypes=mapColTypes):
object=entry
areas.extend(object.getMapAreas())
return areas
@@ -2372,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"
@@ -2629,6 +2667,7 @@ class ECHO_root(Folder,Persistent,Implic
"""hack"""
return "#dddddd"
+ security.declareProtected('View','contentTypeSelector_HTML')
def contentTypeSelector_HTML(self,selected=None):
"""give type selector"""
if not selected:
@@ -2671,23 +2710,6 @@ class ECHO_root(Folder,Persistent,Implic
"""nothing"""
return retStr
- def renderingTypeSelector_HTML(self,selected=None):
- """give type selector"""
- if not selected:
- retStr="