--- ECHO_content/ECHO_collection.py 2004/07/01 15:11:04 1.133
+++ ECHO_content/ECHO_collection.py 2004/08/05 13:51:32 1.160
@@ -14,6 +14,7 @@ import re
import os
import OFS.Image
from types import *
+from OFS.Cache import Cacheable
from OFS.Image import Image
from Globals import DTMLFile
from OFS.Folder import Folder
@@ -29,7 +30,8 @@ from Products.PageTemplates.ZopePageTemp
from Globals import Persistent, package_home
from Acquisition import Implicit
from ECHO_helpers import displayTypes
-
+import urllib
+import time
try:
from psycopg import libpq
@@ -46,7 +48,91 @@ import xml.dom.minidom
from ECHO_graphicalOverview import javaHandler,javaScriptMain
import ECHO_helpers
-def getCopyrightsFromForm(self,argv):
+def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
+ """Rerender all Links"""
+ ret=""
+
+ if not obj:
+ obj = self
+
+ entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_resource'],search_sub=1)
+
+ for entry in entries:
+ if entry[1].meta_type == 'ECHO_resource':
+ try:
+ entry[1].ECHO_getResourceMD(template="no")
+ if "title" in types:
+ entry[1].generate_title()
+ if "label" in types:
+ entry[1].generate_label()
+ ret+="OK:"+entry[0]+"-- "+entry[1].getTitle().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"
"
+ except:
+ ret+="Error:"+entry[0]+"
"
+
+
+
+
+ return "
"+ret+"Rerenderd all links to resources in: "+self.title+""
+
+def reloadMetaDataFromStorage(self,RESPONSE=None):
+ """copy metadata from the storage to ECHO"""
+ ret=""
+ resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
+
+ for resource in resources:
+ x=str(resource[1].copyIndex_meta2echo_resource())+"
"
+ ret+=x
+ #print x
+
+
+ if RESPONSE is not None:
+ #RESPONSE.redirect('./manage_main')
+ return ""+ret+""
+
+ return ret
+
+def getRDFDescription(self,linkURL,urn=None,nameDef=None,typeName=None):
+ """rdf"""
+
+ ret=""
+ about=""""""
+ name="""%s"""
+ link="""%s"""
+ clickable="""%s"""
+ #link=""""""
+ type="""%s"""
+ #xlink=""""""
+ if not urn:
+ #urn="urn:"+re.sub('/',':',self.absolute_url())
+ urn=self.absolute_url()
+ about2=about%urn
+ if not nameDef:
+ if hasattr(self,'label') and not (self.label==""):
+ name2=name%self.label
+ elif not self.title=="":
+ name2=name%self.title
+ else:
+ name2=name%self.getId()
+
+ name2=re.sub('&','&',name2)
+ else:
+ name2=name%nameDef
+
+ linkURL=re.sub('http:','',linkURL)
+ linkURL2=re.sub('&','&',linkURL)
+ link2=link%(("http:"+linkURL2),("http:"+urllib.quote(linkURL)))
+ clickable2=clickable%"true"
+
+ if not typeName:
+ type2=type%self.meta_type
+ else:
+ type2=type%typeName
+
+ #ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n"+clickable2+"\n"
+ ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n"
+ return ret
+
+def getCopyrightsFromForm(self,argv):
medias={}
partners={}
copyrights={}
@@ -186,8 +272,9 @@ class BrowserCheck:
-def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
+def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,xmlfrag=None,digiliburlprefix=None):
"""Einlesen der Metadaten und und erstellen des geaenderten XML file"""
+ print "url",url
def updateTextToolNode(tag,value):
#print dom,tag,value
metanode=dom.getElementsByTagName('texttool')[0]
@@ -204,20 +291,31 @@ def writeMetadata(url,metadict,project=N
node.appendChild(nodetext)
metanode.appendChild(node)
-
- try:
- geturl=""
- for line in urllib.urlopen(url).readlines():
- geturl=geturl+line
-
-
- except:
- return (None,"Cannot open: "+url)
-
- try:
+ if xmlfrag:
+ geturl="""
+
+
+
+
+
+ """
dom=xml.dom.minidom.parseString(geturl)
- except:
- return (None,"Cannot parse: "+url+"
"+geturl)
+ else:
+ try:
+ geturl=""
+ for line in urllib.urlopen(url).readlines():
+ geturl=geturl+line
+
+
+ except:
+ return (None,"Cannot open: "+url)
+
+ try:
+ dom=xml.dom.minidom.parseString(geturl)
+ except:
+ return (None,"Cannot parse: "+url+"
"+geturl)
+
+
metanodes=dom.getElementsByTagName('bib')
@@ -273,6 +371,8 @@ def writeMetadata(url,metadict,project=N
updateTextToolNode('xslt',xslt)
+ if digiliburlprefix:
+ updateTextToolNode('digiliburlprefix',digiliburlprefix)
return dom.toxml().encode('utf-8')
@@ -477,6 +577,8 @@ def manage_addECHO_layoutTemplate(self,
REQUEST.RESPONSE.redirect(u+'/manage_main')
return ''
+
+
class ECHO_resource(Folder,Persistent):
"""ECHO Ressource"""
security=ClassSecurityInfo()
@@ -486,6 +588,67 @@ class ECHO_resource(Folder,Persistent):
getSubCols = ECHO_helpers.getSubCols
+ security.declareProtected('View','index_html')
+
+ def showRDF(self):
+ """showrdf"""
+ self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+ ret="""\n\n"""
+ ret+=self.getRDF(urn="echo:collectionroot")+"\n"
+
+ ret+=""""""
+ return ret
+
+ def getRDF(self,urn=None):
+ """rdf"""
+ ret=getRDFDescription(self,self.link,urn=urn)
+ return ret+self.createSubElementRDF(urn=urn)
+
+
+ def createSubElementRDF(self,urn=None):
+ """rdf list"""
+ if not urn:
+ urn=self.absolute_url()
+ ret=""
+
+ rettemp="""\n"""%urn
+ flag=0
+
+ li="""\n"""
+ if not ('' in self.getFullTextXML(noredirect='Yes')):
+ nurn=self.absolute_url()+'/getFullTextXML'
+ rettemp+=li%nurn
+ flag=1
+ if not ('' in self.getImageView(noredirect='Yes')):
+ nurn=self.absolute_url()+'/getImageView'
+ rettemp+=li%nurn
+ flag=1
+
+
+ if not ('' in self.showMetaDataXML()):
+ nurn=self.absolute_url()+'/showMetaDataXML'
+ rettemp+=li%nurn
+ flag=1
+
+ rettemp+=""
+
+ if flag==1:
+ ret+=rettemp
+
+ if not ('' in self.getFullTextXML(noredirect='Yes')):
+ nurn=self.absolute_url()+'/getFullTextXML'
+ ret+=getRDFDescription(self,self.absolute_url()+'/getFullTextXML',urn=nurn,nameDef="Fulltext",typeName="ECHO_fulltext")
+
+ if not ('' in self.getImageView(noredirect='Yes')):
+ nurn=self.absolute_url()+'/getImageView'
+ ret+=getRDFDescription(self,self.absolute_url()+'/getImageView',urn=nurn,nameDef="Image View",typeName="ECHO_imageview")
+
+ if not ('' in self.showMetaDataXML()):
+ nurn=self.absolute_url()+'/showMetaDataXML'
+ ret+=getRDFDescription(self,self.absolute_url()+'/showMetaDataXML',urn=nurn,nameDef="Metadata",typeName="ECHO_metaData")
+
+ return ret
+
def getAccessRightSelectorHTML(self,outlook="select"):
"""htmlselector"""
values=['free','mpiwg']
@@ -503,7 +666,7 @@ class ECHO_resource(Folder,Persistent):
else:
ret=""
for value in values:
- print
+
if value==self.getAccessRightMD():
ret+="""%s"""%(self.getId(),value,value)
else:
@@ -650,7 +813,9 @@ class ECHO_resource(Folder,Persistent):
path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server
-
+ path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server
+ path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server
+ path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
path=re.sub('/index.meta','',path)
@@ -683,19 +848,20 @@ class ECHO_resource(Folder,Persistent):
return default
- def changeViewerTemplateSet(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,RESPONSE=None):
+ def changeViewerTemplateSet(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix,RESPONSE=None):
"""changeit"""
- paramList=['project','startpage','xslt','thumbtemplate','topbar','digiLibTemplate']
+ paramList=['project','startpage','xslt','thumbtemplate','topbar','digiLibTemplate','digiliburlprefix']
#writeMetadata(self.metalink,self.metaDataHash,project,None,xslt,thumbtemplate,topbar,digiLibTemplate)
- params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate)
+ params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s&digiliburlprefix=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix)
urllib.urlopen('http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))).read()
+ #print self.absolute_url()+'/newMetaXML'+urllib.quote'?'+params)
# hack Pfad auf die Dokumente
path=self.metalink
@@ -710,7 +876,9 @@ class ECHO_resource(Folder,Persistent):
path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server
-
+ path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server
+ path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
+ path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server
return urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
if RESPONSE is not None:
@@ -719,12 +887,20 @@ class ECHO_resource(Folder,Persistent):
def getTitle(self):
"""title"""
- return self.title.decode('utf-8','ignore')
-
+ try:
+ return self.title.encode('utf-8','ignore')
+ except:
+ self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error
+ return self.title.encode('utf-8','ignore')
+
def getLabel(self):
"""title"""
- return self.label.decode('utf-8','ignore')
-
+ try:
+ return self.label.encode('utf-8','ignore')
+ except:
+ self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error
+ return self.label.encode('utf-8','ignore')
+
def content_html(self):
"""template fuer content"""
return content_html(self,'resource')
@@ -743,8 +919,9 @@ class ECHO_resource(Folder,Persistent):
texttools=dom.getElementsByTagName('texttool')
text=texttools[0].getElementsByTagName('text')
texturl=getText(text[0].childNodes)
- self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+
if not noredirect:
+ self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
self.REQUEST.RESPONSE.redirect(texturl)
else:
return texturl
@@ -756,6 +933,34 @@ class ECHO_resource(Folder,Persistent):
else:
return "no fulltext available"
+
+ def getImageView(self,noredirect=None):
+ """getImages; give Imageviewr and if somthing goes wrong."""
+ try:
+ fh=urllib.urlopen(self.metalink)
+ dom=xml.dom.minidom.parse(fh)
+ texttools=dom.getElementsByTagName('texttool')
+ text=texttools[0].getElementsByTagName('image')
+ imagetemp=getText(text[0].childNodes)
+
+ text=dom.getElementsByTagName('archive-path')
+ archivepath=getText(text[0].childNodes)
+ archivepath=re.sub('/mpiwg/online/','',archivepath)
+ imageurl="http://echo.mpiwg-berlin.mpg.de/zogilib?fn="+archivepath+"/"+imagetemp
+ if not noredirect:
+ self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+ self.REQUEST.RESPONSE.redirect(imageurl)
+ else:
+ return imageurl
+ except:
+
+ if not noredirect:
+ self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+ self.REQUEST.RESPONSE.write("no fulltext available")
+ else:
+ return "no images available"
+
+
def getCopyrightsHTML(self):
"""gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""
@@ -766,14 +971,19 @@ class ECHO_resource(Folder,Persistent):
return "ERROR"
ret=[]
- for copyright in obj.getCopyrights():
+ for copyright in obj.getCopyrights(): #copyright - media / partner / copyrightID
- link="copyrightTypes/"+copyright[2]+'/copyright.html'
try:
- copyrightTypeObj=getattr(self.copyrightTypes,copyright[2])
+ if hasattr(self.copyrightTypes,copyright[2]):
+ copyrightTypeObj=getattr(self.copyrightTypes,copyright[2])
+ link="copyrightTypes/"+copyright[2]+'/copyright.html'
+ else:
+ copyrightTypeObj=getattr(obj,copyright[2])
+ link="copyrightModel/"+copyright[2]+'/copyright.html'
+
label=copyrightTypeObj.label
- url=copyrightTypeObj.url
+ url=getattr(copyrightTypeObj, 'url', '')
if url!='':
ret.append((url,copyright[0],copyright[1],copyright[2],label))
@@ -786,6 +996,17 @@ class ECHO_resource(Folder,Persistent):
"""nothing"""
return ret
+
+ def getInstitutionsHTML(self):
+ """gibt Liste der fšrdernden Institutionen aus"""
+
+ if hasattr(self,'support'):
+ obj=self.support
+ ret=obj.getSupporter()
+ return ret
+ else:
+ return ''
+
def getCredits(self):
"""Ausgabe der credits"""
@@ -821,7 +1042,7 @@ class ECHO_resource(Folder,Persistent):
def getCoords(self):
- """gibt coordinaten als String zurück und löscht zugleich einträge die keine Koordinaten sind, letzteres zur korrektur der Eingabe der alten version"""
+ """gibt coordinaten als String zurück und löscht zugleich einträge die keine Koordinaten sind, letzteres zur korrektur der Eingabe der alten version"""
retList=[]
if hasattr(self,'coords'):
for x in self.coords:
@@ -899,7 +1120,7 @@ class ECHO_resource(Folder,Persistent):
def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,RESPONSE=None):
- """Änderung der Properties"""
+ """Änderung der Properties"""
self.resourceID=resourceID
self.title=title
self.label=label
@@ -917,7 +1138,7 @@ class ECHO_resource(Folder,Persistent):
def changeECHO_resource_coords(self,coords,viewClassification,RESPONSE=None):
- """Änderung der Properties - coords"""
+ """Änderung der Properties - coords"""
if type(coords)==StringType:
coords=[coords]
@@ -934,7 +1155,7 @@ class ECHO_resource(Folder,Persistent):
RESPONSE.redirect('manage_main')
def changeECHO_resource_credits(self,credits,responsible,copyrightType,RESPONSE=None):
- """Änderung der Properties"""
+ """Änderung der Properties"""
self.credits=credits
self.responsible=responsible
self.copyrightType=copyrightType
@@ -975,7 +1196,7 @@ class ECHO_resource(Folder,Persistent):
def getMDValue(self,fieldName):
return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
- def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
+ def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None):
"""new index.meta"""
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
@@ -983,17 +1204,26 @@ class ECHO_resource(Folder,Persistent):
self.copyIndex_meta2echo_resource()
try:
- return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
+ return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix=digiliburlprefix)
except:
- return writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
+ return writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix=digiliburlprefix)
+ def showMetaDataXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
+ """schreibe md"""
+
+ try:
+
+ return writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,xmlfrag="yes")
+ except:
+ return " no metadata stored"
+
def getMetaDataXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
"""prints out metadata as stored in the echo environment, format is the index.meta format"""
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
return writeMetadata(self.metalink,self.metaDataHash)
def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,viewClassification="",coords=None,credits=None,RESPONSE=None):
- """Änderung der Properties"""
+ """Änderung der Properties"""
try:
coordsnew=[ string.split(x,",") for x in coords]
@@ -1016,7 +1246,7 @@ class ECHO_resource(Folder,Persistent):
{'label':'Change Coords','action':'ECHO_resource_config_coords'},
{'label':'Add coords','action':'ECHO_graphicEntry'},
{'label':'Sync Metadata','action':'ECHO_getResourceMD'},
- {'label':'Change TemplateSets','action':'changeViewerTemplateSetForm'},
+ {'label':'Change TemplateSets and Image Viewer','action':'changeViewerTemplateSetForm'},
{'label':'set/change startpage','action':'setStartPageForm'},
{'label':'Copy MD for indexing and search','action':'copySearchFields'},
)
@@ -1196,7 +1426,7 @@ class ECHO_resource(Folder,Persistent):
self.metaDataHash={}
if not error=="": #Fehler beim Auslesen des Metafiles
- return "ERROR:",error
+ return "ERROR:",error,self.absolute_url()
self.contentType=metadict['bib_type'][0:]
fields=self.findTagsFromMapping(self.contentType)
@@ -1265,7 +1495,7 @@ class ECHO_resource(Folder,Persistent):
if sp:
return sp[1]()
- #prüfen ob irgendwo ein template
+ #prüfen ob irgendwo ein template
if hasattr(self,'startpage_index_template'):
return self.startpage_index_template()
@@ -1329,11 +1559,19 @@ class ECHO_externalLink(Folder):
def getTitle(self):
"""title"""
- return self.title.encode('utf-8')
-
+ try:
+ return self.title.encode('utf-8','ignore')
+ except:
+ self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error
+ return self.title.encode('utf-8','ignore')
+
def getLabel(self):
"""title"""
- return self.label.encode('utf-8')
+ try:
+ return self.label.encode('utf-8','ignore')
+ except:
+ self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error
+ return self.label.encode('utf-8','ignore')
def content_html(self):
"""template fuer content"""
@@ -1371,7 +1609,7 @@ class ECHO_externalLink(Folder):
def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
- """Änderung der Properties"""
+ """Änderung der Properties"""
try:
coordsnew=[ string.split(x,",") for x in coords]
except:
@@ -1442,7 +1680,7 @@ def manage_addECHO_link(self,id,title,la
RESPONSE.redirect('manage_main')
-class ECHO_collection(Folder, Persistent, Implicit):
+class ECHO_collection(Folder, Persistent, Implicit, Cacheable):
"""ECHO Collection"""
security=ClassSecurityInfo()
@@ -1452,6 +1690,40 @@ class ECHO_collection(Folder, Persistent
path="/mpiwg/online/permanent/shipbuilding"
+ def getRDF(self,urn=None):
+ """rdf of the collection"""
+
+ contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
+
+ ret=getRDFDescription(self,self.absolute_url(),urn=urn)
+
+ if not urn:
+ urn=self.absolute_url()
+
+ li="""\n"""
+
+
+ for content in contents:
+ ret+=content[1].getRDF()+"\n"
+
+ ret+="""\n"""%urn
+ for content in contents:
+ nurn=content[1].absolute_url()
+ ret+=li%nurn
+ return ret+""
+
+
+ def showRDF(self):
+ """showrdf"""
+ self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+ ret="""\n\n"""
+ ret+=self.getRDF(urn="echo:collectionroot")+"\n"
+
+ ret+=""""""
+
+ return ret
+
+
def changeLabels(self):
"""change form"""
pt=PageTemplateFile('Products/ECHO_content/zpt/changeLabelsForm').__of__(self)
@@ -1581,26 +1853,48 @@ class ECHO_collection(Folder, Persistent
def isSelectedViewerTemplateSet(self,obj,id):
- """is ausgewählt"""
+ """is ausgewählt"""
if self.REQUEST['viewerTemplateSet']==id:
return 1
else:
return None
- def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,RESPONSE=None):
+ def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix,RESPONSE=None):
"""change the templates"""
- resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+ resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
+
+ for resource in resources:
+
+ resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix)
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+
+ def setStartpageFolderForm(self):
+ """Form for changing the startpage"""
+
+
+ pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resourceStartPageFolder.zpt').__of__(self)
+ pt.content_type="text/html"
+ return pt()
+
+ def setStartpageFolder(self,startpage=None,RESPONSE=None):
+ """change the templates"""
+
+ resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
for resource in resources:
- resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate)
+ resource[1].setStartPage(startpage)
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
+
def copySearchFields(self,RESPONSE=None):
"""copys import metadatafields to the object"""
resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
@@ -1611,21 +1905,19 @@ class ECHO_collection(Folder, Persistent
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
+
+ def reloadMetaDataFromStorageWarning(self,RESPONSE=None):
+ """warning"""
+ pt=PageTemplateFile('Products/ECHO_content/zpt/reloadMetaDataFromStorageWarning.zpt').__of__(self)
+ pt.content_type="text/html"
+ return pt()
def reloadMetaDataFromStorage(self,RESPONSE=None):
"""copy metadata from the storage to ECHO"""
- ret=""
- resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
-
- for resource in resources:
- ret+=str(resource[1].copyIndex_meta2echo_resource())+"
"
+ return reloadMetaDataFromStorage(self,RESPONSE=None)
-
- if RESPONSE is not None:
- # RESPONSE.redirect('manage_main')
- return ret
-
+
def getPartnerCopyright(self,name,sonst="generic"):
"""gibt generisches copyright eines partners aus, sonst behalte jetzige einsteillung"""
#print "hi",name,sonst
@@ -1662,14 +1954,20 @@ class ECHO_collection(Folder, Persistent
def getTitle(self):
"""title"""
- return self.title.encode('utf-8')
-
+ try:
+ return self.title.encode('utf-8','ignore')
+ except:
+ self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error
+ return self.title.encode('utf-8','ignore')
+
def getLabel(self):
"""title"""
- return self.label.encode('utf-8')
-
-
-
+ try:
+ return self.label.encode('utf-8','ignore')
+ except:
+ self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error
+ return self.label.encode('utf-8','ignore')
+
def createRessourcesFromXMLForm(self):
"""form"""
pt=PageTemplateFile('Products/ECHO_content/zpt/createRessourcesFromXMLForm.zpt').__of__(self)
@@ -1689,6 +1987,7 @@ class ECHO_collection(Folder, Persistent
ret+=""+label+"
"
manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
return ret
+
def getImageTag(self):
"""GetTag"""
try:
@@ -1866,34 +2165,20 @@ class ECHO_collection(Folder, Persistent
security.declarePublic('ECHO_rerenderLinksMD')
- def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
- """Rerender all Links"""
- ret=""
-
- if not obj:
- obj = self
-
- entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_resource','ECHO_collection'])
- for entry in entries:
- if entry[1].meta_type == 'ECHO_resource':
- try:
- entry[1].ECHO_getResourceMD(template="no")
- if "title" in types:
- entry[1].generate_title()
- if "label" in types:
- entry[1].generate_label()
- ret+="OK:"+entry[0]+"-- "+entry[1].getTitle().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"
"
- except:
- ret+="Error:"+entry[0]+"
"
+ def ECHO_rerenderLinksMDWarning(self):
+ """change form"""
+ pt=PageTemplateFile('Products/ECHO_content/zpt/rerenderLinksWarning').__of__(self)
+ pt.content_type="text/html"
+ return pt()
- else:
- self.ECHO_rerenderLinksMD(entry[1])
-
-
- return ret+"Rerenderd all links to resources in: "+self.title
+
+ def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
+ """Rerender all Links"""
+ return ECHO_rerenderLinksMD(self,obj,types)
+
security.declarePublic('ECHO_newViewerLink')
@@ -1928,15 +2213,16 @@ class ECHO_collection(Folder, Persistent
self.bgcolour=bgcolour
- manage_options = Folder.manage_options+(
+ manage_options = Folder.manage_options+ Cacheable.manage_options+(
{'label':'Main Config','action':'ECHO_collection_config'},
{'label':'Change Labels','action':'changeLabels'},
{'label':'Change Titles','action':'changeTitles'},
- {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMD'},
+ {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMDWarning'},
{'label':'Graphics','action':'ECHO_graphicEntry'},
{'label':'create resources from XML','action':'createRessourcesFromXMLForm'},
- {'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'},
- {'label':'Reload Metadata','action':'reloadMetaDataFromStorage'},
+ {'label':'Set Startpage','action':'setStartpageFolderForm'},
+ {'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'},
+ {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
{'label':'ImportCollection','action':'updateCollection'},
{'label':'Copy MD for indexing and search','action':'copySearchFields'},
)
@@ -2037,20 +2323,29 @@ class ECHO_collection(Folder, Persistent
def index_html(self):
"""standard page"""
-
+ if self.ZCacheable_isCachingEnabled():
+
+ result = self.ZCacheable_get()
+ if result is not None:
+ # Got a cached value.
+ return result
+
if 'index.html' in self.__dict__.keys():
- return getattr(self,'index.html')()
+ ret=getattr(self,'index.html')()
elif 'overview' in self.__dict__.keys():
- return self.showOverview()
+ ret=self.showOverview()
elif hasattr(self,'collection_index_template'):
- return self.collection_index_template()
+ ret=self.collection_index_template()
elif hasattr(self,'main_index_template'):
- return self.main_index_template()
-
- pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
- pt.content_type="text/html"
- return pt()
+ ret=self.main_index_template()
+ else:
+ pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
+ pt.content_type="text/html"
+ ret=pt.render()
+
+ self.ZCacheable_set(ret)
+ return ret
def content_html(self):
"""template fuer content"""
@@ -2142,11 +2437,43 @@ class ECHO_group(ECHO_collection):
manage_options = Folder.manage_options+(
{'label':'Main Config','action':'ECHO_group_config'},
- {'label':'Rerender Links','action':'ECHO_rerenderLinksMD'},
+ {'label':'Rerender Links','action':'ECHO_rerenderLinksMDWarning'},
{'label':'Graphics','action':'ECHO_graphicEntry'},
)
security.declareProtected('View','index_html')
+
+ def showRDF(self):
+ """showrdf"""
+ self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+ ret="""\n\n"""
+ ret+=self.getRDF(urn="echo:collectionroot")+"\n"
+
+ ret+=""""""
+
+ return ret
+
+ def getRDF(self,urn=None):
+ """rdf of the collection"""
+ contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
+
+ ret=getRDFDescription(self,self.absolute_url(),urn=urn)
+
+
+ if not urn:
+ urn=self.absolute_url()
+ li="""\n"""
+
+
+ for content in contents:
+ ret+=content[1].getRDF()+"\n"
+
+ ret+="""\n"""%urn
+ for content in contents:
+ nurn=content[1].absolute_url()
+ ret+=li%nurn
+ return ret+""
+
def index_html(self):
"""standard page"""
displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes)
@@ -2185,7 +2512,7 @@ class ECHO_group(ECHO_collection):
return pt()
def changeECHO_group(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",logo=""):
- """Änderung der Properties"""
+ """Änderung der Properties"""
self.secondaryLink=secondaryLink
self.secondaryLinkTitle=secondaryLinkTitle
@@ -2363,6 +2690,54 @@ class ECHO_root(Folder,Persistent,Implic
meta_type="ECHO_root"
+
+ manage_options=Folder.manage_options+(
+ {'label':'Main Config','action':'ECHO_copyright_configForm'},
+ {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
+ )
+
+
+ def showRDF(self):
+ """showrdf"""
+ self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+ ret="""\n\n"""
+ ret+=self.getRDF(urn="echo:collectionroot")+"\n"
+
+ ret+=""""""
+ return ret
+
+
+ def reloadMetaDataFromStorageWarning(self,RESPONSE=None):
+ """warning"""
+ pt=PageTemplateFile('Products/ECHO_content/zpt/reloadMetaDataFromStorageWarning.zpt').__of__(self)
+ pt.content_type="text/html"
+ return pt()
+
+ def reloadMetaDataFromStorage(self,RESPONSE=None):
+ """reload MD from Storage"""
+
+ return reloadMetaDataFromStorage(self,RESPONSE)
+
+ def getRDF(self,urn=None):
+ """rdf of the collection"""
+
+ contents=self.ZopeFind(self,obj_metatypes=['ECHO_group','ECHO_resource','ECHO_collection'])
+
+ ret=getRDFDescription(self,self.absolute_url(),urn=urn)
+
+ li="""\n"""
+
+
+ for content in contents:
+ ret+=content[1].getRDF()+"\n"
+
+ ret+="""\n"""%urn
+ for content in contents:
+ nurn=content[1].absolute_url()
+ ret+=li%nurn
+ return ret+""
+
+
def showContent(self,path):
"""return content/html"""
@@ -2375,7 +2750,7 @@ class ECHO_root(Folder,Persistent,Implic
def getBibTag(self,tag,content):
- """get field tag für index-meta-generation"""
+ """get field tag für index-meta-generation"""
if not content or content=="":
return ""
ret="<%s>"%tag
@@ -2463,7 +2838,7 @@ class ECHO_root(Folder,Persistent,Implic
return retStr
- def copyrightTypeSelector_HTML(self,selected=None,first=None):
+ def copyrightTypeSelector_HTML(self, object=None, selected=None,first=None):
"""give type selector"""
if not first:
@@ -2484,8 +2859,16 @@ class ECHO_root(Folder,Persistent,Implic
retStr+="""