ECHO_content/ECHO_collection.py - diff

Return to ECHO_collection.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.132 and 1.151

version 1.132, 2004/07/01 07:46:17	version 1.151, 2004/07/23 12:29:14
Line 29 from Products.PageTemplates.ZopePageTemp	Line 29 from Products.PageTemplates.ZopePageTemp
from Globals import Persistent, package_home	from Globals import Persistent, package_home
from Acquisition import Implicit	from Acquisition import Implicit
from ECHO_helpers import displayTypes	from ECHO_helpers import displayTypes
	import urllib

try:	try:
from psycopg import libpq	from psycopg import libpq
Line 46 import xml.dom.minidom	Line 46 import xml.dom.minidom
from ECHO_graphicalOverview import javaHandler,javaScriptMain	from ECHO_graphicalOverview import javaHandler,javaScriptMain
import ECHO_helpers	import ECHO_helpers

	def getRDFDescription(self,linkURL,urn=None,nameDef=None,typeName=None):
	"""rdf"""

	ret=""
	about="""<RDF:Description RDF:about="%s">"""
	name="""<ECHONAVIGATION:name>%s</ECHONAVIGATION:name>"""
	link="""<ECHONAVIGATION:link xlink:href="%s">%s</ECHONAVIGATION:link>"""
	clickable="""<ECHONAVIGATION:linkClickable>%s</ECHONAVIGATION:linkClickable>"""
	#link="""<ECHONAVIGATION:link RDF:about="%s"/>"""
	type="""<ECHONAVIGATION:type>%s</ECHONAVIGATION:type>"""
	#xlink="""<ECHONAVIGATION:xlink xlink:href="%s"/>"""
	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</RDF:Description>"
	ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n</RDF:Description>"
	return ret

def getCopyrightsFromForm(self,argv):	def getCopyrightsFromForm(self,argv):
medias={}	medias={}
partners={}	partners={}
Line 186 class BrowserCheck:	Line 227 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):
"""Einlesen der Metadaten und und erstellen des geaenderten XML file"""	"""Einlesen der Metadaten und und erstellen des geaenderten XML file"""
def updateTextToolNode(tag,value):	def updateTextToolNode(tag,value):
#print dom,tag,value	#print dom,tag,value
Line 204 def writeMetadata(url,metadict,project=N	Line 245 def writeMetadata(url,metadict,project=N
node.appendChild(nodetext)	node.appendChild(nodetext)
metanode.appendChild(node)	metanode.appendChild(node)

	if xmlfrag:
	geturl="""<?xml version="1.0" ?>
	<resource type="MPIWG">
	<meta>
	<bib type="Book">
	</bib>
	</meta>
	</resource>"""
	dom=xml.dom.minidom.parseString(geturl)
	else:
try:	try:
geturl=""	geturl=""
for line in urllib.urlopen(url).readlines():	for line in urllib.urlopen(url).readlines():
Line 219 def writeMetadata(url,metadict,project=N	Line 269 def writeMetadata(url,metadict,project=N
except:	except:
return (None,"Cannot parse: "+url+"<br>"+geturl)	return (None,"Cannot parse: "+url+"<br>"+geturl)



metanodes=dom.getElementsByTagName('bib')	metanodes=dom.getElementsByTagName('bib')

if not metanodes:	if not metanodes:
Line 477 def manage_addECHO_layoutTemplate(self,	Line 529 def manage_addECHO_layoutTemplate(self,
REQUEST.RESPONSE.redirect(u+'/manage_main')	REQUEST.RESPONSE.redirect(u+'/manage_main')
return ''	return ''



class ECHO_resource(Folder,Persistent):	class ECHO_resource(Folder,Persistent):
"""ECHO Ressource"""	"""ECHO Ressource"""
security=ClassSecurityInfo()	security=ClassSecurityInfo()
Line 486 class ECHO_resource(Folder,Persistent):	Line 540 class ECHO_resource(Folder,Persistent):

getSubCols = ECHO_helpers.getSubCols	getSubCols = ECHO_helpers.getSubCols

	security.declareProtected('View','index_html')

	def showRDF(self):
	"""showrdf"""
	self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
	ret="""<?xml version="1.0" encoding="utf-8"?>\n<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
	ret+=self.getRDF(urn="echo:collectionroot")+"\n"

	ret+="""</RDF:RDF>"""
	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="""<RDF:Seq RDF:about="%s">\n"""%urn
	flag=0

	li="""<RDF:li RDF:resource="%s" />\n"""
	if not ('<error>' in self.getFullTextXML(noredirect='Yes')):
	nurn=self.absolute_url()+'/getFullTextXML'
	rettemp+=li%nurn
	flag=1
	if not ('<error>' in self.getImageView(noredirect='Yes')):
	nurn=self.absolute_url()+'/getImageView'
	rettemp+=li%nurn
	flag=1


	if not ('<error>' in self.showMetaDataXML()):
	nurn=self.absolute_url()+'/showMetaDataXML'
	rettemp+=li%nurn
	flag=1

	rettemp+="</RDF:Seq>"

	if flag==1:
	ret+=rettemp

	if not ('<error>' 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 ('<error>' 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 ('<error>' 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"):	def getAccessRightSelectorHTML(self,outlook="select"):
"""htmlselector"""	"""htmlselector"""
values=['free','mpiwg']	values=['free','mpiwg']
Line 503 class ECHO_resource(Folder,Persistent):	Line 618 class ECHO_resource(Folder,Persistent):
else:	else:
ret=""	ret=""
for value in values:	for value in values:
print
if value==self.getAccessRightMD():	if value==self.getAccessRightMD():
ret+="""<input type="radio" name="%s" value="%s" checked>%s"""%(self.getId(),value,value)	ret+="""<input type="radio" name="%s" value="%s" checked>%s"""%(self.getId(),value,value)
else:	else:
Line 650 class ECHO_resource(Folder,Persistent):	Line 765 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: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.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('/index.meta','',path)	path=re.sub('/index.meta','',path)


Line 710 class ECHO_resource(Folder,Persistent):	Line 826 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: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.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

return urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()	return urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()

Line 719 class ECHO_resource(Folder,Persistent):	Line 837 class ECHO_resource(Folder,Persistent):

def getTitle(self):	def getTitle(self):
"""title"""	"""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):	def getLabel(self):
"""title"""	"""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):	def content_html(self):
"""template fuer content"""	"""template fuer content"""
Line 743 class ECHO_resource(Folder,Persistent):	Line 869 class ECHO_resource(Folder,Persistent):
texttools=dom.getElementsByTagName('texttool')	texttools=dom.getElementsByTagName('texttool')
text=texttools[0].getElementsByTagName('text')	text=texttools[0].getElementsByTagName('text')
texturl=getText(text[0].childNodes)	texturl=getText(text[0].childNodes)
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
if not noredirect:	if not noredirect:
	self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
self.REQUEST.RESPONSE.redirect(texturl)	self.REQUEST.RESPONSE.redirect(texturl)
else:	else:
return texturl	return texturl
Line 756 class ECHO_resource(Folder,Persistent):	Line 883 class ECHO_resource(Folder,Persistent):
else:	else:
return "<error>no fulltext available</error>"	return "<error>no fulltext available</error>"


	def getImageView(self,noredirect=None):
	"""getImages; give Imageviewr and <error></error> 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("<error>no fulltext available</error>")
	else:
	return "<error>no images available</error>"


def getCopyrightsHTML(self):	def getCopyrightsHTML(self):
"""gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""	"""gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""

Line 766 class ECHO_resource(Folder,Persistent):	Line 921 class ECHO_resource(Folder,Persistent):
return "ERROR"	return "ERROR"
ret=[]	ret=[]

for copyright in obj.getCopyrights():	for copyright in obj.getCopyrights(): #copyright - media / partner / copyrightID

link="copyrightTypes/"+copyright[2]+'/copyright.html'

try:	try:
	if hasattr(self.copyrightTypes,copyright[2]):
copyrightTypeObj=getattr(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	label=copyrightTypeObj.label
url=copyrightTypeObj.url	url=getattr(copyrightTypeObj, 'url', '')

if url!='':	if url!='':
ret.append((url,copyright[0],copyright[1],copyright[2],label))	ret.append((url,copyright[0],copyright[1],copyright[2],label))
Line 888 class ECHO_resource(Folder,Persistent):	Line 1048 class ECHO_resource(Folder,Persistent):
self.contentType=self.bib_type	self.contentType=self.bib_type
for data in self.metadata:	for data in self.metadata:
data_neu=re.sub('-','_',data)	data_neu=re.sub('-','_',data)
self.metaDataHash[data_neu]=getattr(self,data)[0:]	self.meta
	DataHash[data_neu]=getattr(self,data)[0:]


pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self)	pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self)
Line 986 class ECHO_resource(Folder,Persistent):	Line 1147 class ECHO_resource(Folder,Persistent):
except:	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)

	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 "<error> no metadata stored</error>"

def getMetaDataXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):	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"""	"""prints out metadata as stored in the echo environment, format is the index.meta format"""
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')	self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
Line 1212 class ECHO_resource(Folder,Persistent):	Line 1382 class ECHO_resource(Folder,Persistent):
if RESPONSE:	if RESPONSE:
return RESPONSE.redirect('manage_main')	return RESPONSE.redirect('manage_main')

def ECHO_getResourceMD(self,template="yes"):	def ECHO_getResourceMD(self,template="yes",back=None):
"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""	"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
(metadict, error)=readMetadata(self.metalink)	(metadict, error)=readMetadata(self.metalink)

	if back:
	self.REQUEST.SESSION['back']=back

if not error=="": #Fehler beim Auslesen des Metafiles	if not error=="": #Fehler beim Auslesen des Metafiles
return "ERROR:",error	return "ERROR:",error
Line 1282 class ECHO_resource(Folder,Persistent):	Line 1453 class ECHO_resource(Folder,Persistent):


security.declarePublic('generate_label') # has to be change, presentlyset because of OSAS koordination	security.declarePublic('generate_label') # has to be change, presentlyset because of OSAS koordination

def generate_label(self):	def generate_label(self):
"""Erzeugt_standard_Label aus Template"""	"""Erzeugt_standard_Label aus Template"""
pt=getattr(self,"label_template_"+self.contentType.lower())	pt=getattr(self,"label_template_"+self.contentType.lower())
Line 1290 class ECHO_resource(Folder,Persistent):	Line 1462 class ECHO_resource(Folder,Persistent):
return pt()	return pt()

security.declarePublic('generate_title') # has to be change, presentlyset because of OSAS koordination	security.declarePublic('generate_title') # has to be change, presentlyset because of OSAS koordination

def generate_title(self,RESPONSE=None):	def generate_title(self,RESPONSE=None):
"""Erzeugt_standard_Label aus Template"""	"""Erzeugt_standard_Label aus Template"""
pt=getattr(self,"label_template_"+self.contentType.lower())	pt=getattr(self,"label_template_"+self.contentType.lower())
Line 1325 class ECHO_externalLink(Folder):	Line 1498 class ECHO_externalLink(Folder):

def getTitle(self):	def getTitle(self):
"""title"""	"""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):	def getLabel(self):
"""title"""	"""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):	def content_html(self):
"""template fuer content"""	"""template fuer content"""
Line 1448 class ECHO_collection(Folder, Persistent	Line 1629 class ECHO_collection(Folder, Persistent

path="/mpiwg/online/permanent/shipbuilding"	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="""<RDF:li RDF:resource="%s" />\n"""


	for content in contents:
	ret+=content[1].getRDF()+"\n"

	ret+="""<RDF:Seq RDF:about="%s">\n"""%urn
	for content in contents:
	nurn=content[1].absolute_url()
	ret+=li%nurn
	return ret+"</RDF:Seq>"


	def showRDF(self):
	"""showrdf"""
	self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
	ret="""<?xml version="1.0" encoding="utf-8"?>\n<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
	ret+=self.getRDF(urn="echo:collectionroot")+"\n"

	ret+="""</RDF:RDF>"""

	return ret


	def changeLabels(self):
	"""change form"""
	pt=PageTemplateFile('Products/ECHO_content/zpt/changeLabelsForm').__of__(self)
	pt.content_type="text/html"
	return pt()

	def changeTitles(self):
	"""change form"""
	pt=PageTemplateFile('Products/ECHO_content/zpt/changeTitleForm').__of__(self)
	pt.content_type="text/html"
	return pt()

def changeAccessRightsCollection(self):	def changeAccessRightsCollection(self):
"""change"""	"""change"""
ret=""	ret=""
Line 1463 class ECHO_collection(Folder, Persistent	Line 1690 class ECHO_collection(Folder, Persistent
"""not"""	"""not"""
return ret	return ret

	def changeLabelsInCollection(self):
	"""change all lables of a collection"""
	ret=""
	argv=self.REQUEST.form

	resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
	for resource in resources:

	try:
	ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"</br>"
	resource[1].label=argv[resource[1].getId()][0:]
	except:
	"""not"""
	return ret

	def changeTitlesInCollection(self):
	"""change all lables of a collection"""
	ret=""
	argv=self.REQUEST.form

	resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
	for resource in resources:

	try:
	ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"</br>"
	resource[1].title=argv[resource[1].getId()][0:]
	except:
	"""not"""
	return ret

def updateCollection(self,RESPONSE=None):	def updateCollection(self,RESPONSE=None):
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""	"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
Line 1617 class ECHO_collection(Folder, Persistent	Line 1873 class ECHO_collection(Folder, Persistent

def getTitle(self):	def getTitle(self):
"""title"""	"""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):	def getLabel(self):
"""title"""	"""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):	def createRessourcesFromXMLForm(self):
"""form"""	"""form"""
Line 1644 class ECHO_collection(Folder, Persistent	Line 1906 class ECHO_collection(Folder, Persistent
ret+="<p>"+label+"</p>"	ret+="<p>"+label+"</p>"
manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")	manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
return ret	return ret

def getImageTag(self):	def getImageTag(self):
"""GetTag"""	"""GetTag"""
try:	try:
Line 1821 class ECHO_collection(Folder, Persistent	Line 2084 class ECHO_collection(Folder, Persistent

security.declarePublic('ECHO_rerenderLinksMD')	security.declarePublic('ECHO_rerenderLinksMD')

def ECHO_rerenderLinksMD(self,obj=None):	def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
"""Rerender all Links"""	"""Rerender all Links"""
ret=""	ret=""

Line 1834 class ECHO_collection(Folder, Persistent	Line 2097 class ECHO_collection(Folder, Persistent
if entry[1].meta_type == 'ECHO_resource':	if entry[1].meta_type == 'ECHO_resource':
try:	try:
entry[1].ECHO_getResourceMD(template="no")	entry[1].ECHO_getResourceMD(template="no")
	if "title" in types:
entry[1].generate_title()	entry[1].generate_title()
	if "label" in types:
entry[1].generate_label()	entry[1].generate_label()
ret+="OK:"+entry[0]+"-- "+entry[1].getLabel().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"<br>"	ret+="OK:"+entry[0]+"-- "+entry[1].getTitle().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"<br>"
except:	except:
ret+="Error:"+entry[0]+"<br>"	ret+="Error:"+entry[0]+"<br>"

Line 1883 class ECHO_collection(Folder, Persistent	Line 2148 class ECHO_collection(Folder, Persistent

manage_options = Folder.manage_options+(	manage_options = Folder.manage_options+(
{'label':'Main Config','action':'ECHO_collection_config'},	{'label':'Main Config','action':'ECHO_collection_config'},
{'label':'Rerender Links','action':'ECHO_rerenderLinksMD'},	{'label':'Change Labels','action':'changeLabels'},
	{'label':'Change Titles','action':'changeTitles'},
	{'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMD'},
{'label':'Graphics','action':'ECHO_graphicEntry'},	{'label':'Graphics','action':'ECHO_graphicEntry'},
{'label':'create resources from XML','action':'createRessourcesFromXMLForm'},	{'label':'create resources from XML','action':'createRessourcesFromXMLForm'},
{'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'},	{'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'},
Line 2098 class ECHO_group(ECHO_collection):	Line 2365 class ECHO_group(ECHO_collection):
)	)

security.declareProtected('View','index_html')	security.declareProtected('View','index_html')

	def showRDF(self):
	"""showrdf"""
	self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
	ret="""<?xml version="1.0" encoding="utf-8"?>\n<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
	ret+=self.getRDF(urn="echo:collectionroot")+"\n"

	ret+="""</RDF:RDF>"""

	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="""<RDF:li RDF:resource="%s" />\n"""


	for content in contents:
	ret+=content[1].getRDF()+"\n"

	ret+="""<RDF:Seq RDF:about="%s">\n"""%urn
	for content in contents:
	nurn=content[1].absolute_url()
	ret+=li%nurn
	return ret+"</RDF:Seq>"

def index_html(self):	def index_html(self):
"""standard page"""	"""standard page"""
displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes)	displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes)
Line 2314 class ECHO_root(Folder,Persistent,Implic	Line 2613 class ECHO_root(Folder,Persistent,Implic

meta_type="ECHO_root"	meta_type="ECHO_root"

	def showRDF(self):
	"""showrdf"""
	self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
	ret="""<?xml version="1.0" encoding="utf-8"?>\n<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
	ret+=self.getRDF(urn="echo:collectionroot")+"\n"

	ret+="""</RDF:RDF>"""
	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)

	li="""<RDF:li RDF:resource="%s" />\n"""


	for content in contents:
	ret+=content[1].getRDF()+"\n"

	ret+="""<RDF:Seq RDF:about="%s">\n"""%urn
	for content in contents:
	nurn=content[1].absolute_url()
	ret+=li%nurn
	return ret+"</RDF:Seq>"


def showContent(self,path):	def showContent(self,path):
"""return content/html"""	"""return content/html"""

Line 2414 class ECHO_root(Folder,Persistent,Implic	Line 2742 class ECHO_root(Folder,Persistent,Implic
return retStr	return retStr


def copyrightTypeSelector_HTML(self,selected=None,first=None):	def copyrightTypeSelector_HTML(self, object=None, selected=None,first=None):
"""give type selector"""	"""give type selector"""

if not first:	if not first:
Line 2435 class ECHO_root(Folder,Persistent,Implic	Line 2763 class ECHO_root(Folder,Persistent,Implic
retStr+="""<option selected value="%s">%s\n"""%(copyrightType[0],copyrightType[0])	retStr+="""<option selected value="%s">%s\n"""%(copyrightType[0],copyrightType[0])
else:	else:
retStr+="""<option value="%s">%s\n"""%(copyrightType[0],copyrightType[0])	retStr+="""<option value="%s">%s\n"""%(copyrightType[0],copyrightType[0])

	for copyrightTypeSelf in self.ZopeFind(object,obj_metatypes=["ECHO_copyrightType"],search_sub=1):
	retStr+="""<option value="%s">%s\n"""%(copyrightTypeSelf[0],copyrightTypeSelf[0])

except:	except:
"""nothing"""	"""nothing"""

return retStr	return retStr

def partnerSelector_HTML(self,selected=None):	def partnerSelector_HTML(self,selected=None):
Line 2766 class ECHO_root(Folder,Persistent,Implic	Line 3099 class ECHO_root(Folder,Persistent,Implic
for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):	for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):

echo_url=resource[1].absolute_url()	echo_url=resource[1].absolute_url()
if resource[1].getFullTextXML(noredirect="yes"):
if hasattr(resource[1],'link'):	if hasattr(resource[1],'link'):
viewer_url=echo_url+"/getMetaDataXML"	meta_url=echo_url+"/getMetaDataXML"
else:	else:
viewer_url="NO URL"	meta_url="NO_URL"
if filter:
if re.search(filter,viewer_url):	if filter and not re.search(filter,viewer_url):
ret+="""\n<resource echoLink="%s" viewerLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?'))	continue
else:
ret+="""\n<resource echoLink="%s" viewerLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?'))	ret+="""\n<resource resourceLink="%s" metaLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(meta_url,safe='/:?'))

ret +="""\n</index>"""	ret +="""\n</index>"""

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.132
changed lines
	Added in v.1.151