--- ECHO_content/ECHO_collection.py	2004/07/18 18:13:41	1.147
+++ ECHO_content/ECHO_collection.py	2004/07/20 18:35:48	1.149
@@ -46,18 +46,20 @@ import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain
 import ECHO_helpers
 
-def getRDFDescription(self,linkURL,urn=None,nameDef=None):
+def getRDFDescription(self,linkURL,urn=None,nameDef=None,typeName=None):
 	    """rdf"""
+	    
 	    ret=""
-	    about="""<RDF:Description about="%s">"""
+	    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="urn:"+re.sub('/',':',self.absolute_url())
+		    urn=self.absolute_url()
 	    about2=about%urn
 	    if not nameDef:
 		    if hasattr(self,'label') and not (self.label==""):
@@ -74,10 +76,15 @@ def getRDFDescription(self,linkURL,urn=N
 	    linkURL=re.sub('http:','',linkURL)
 	    linkURL2=re.sub('&','&amp;',linkURL)
 	    link2=link%(("http:"+linkURL2),("http:"+urllib.quote(linkURL)))
+	    clickable2=clickable%"true"
 
-	    type2=type%self.meta_type
+	    if not typeName:
+		    type2=type%self.meta_type
+	    else:
+		    type2=type%typeName
 	    
-	    ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n"+"\n</RDF:Description>"
+	    #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): 
@@ -220,7 +227,7 @@ 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"""
 	def updateTextToolNode(tag,value):
 		#print dom,tag,value
@@ -238,20 +245,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="""<?xml version="1.0" ?>
+                           <resource type="MPIWG">
+			   <meta>
+			    <bib type="Book">
+	                    </bib>
+			    </meta>
+			    </resource>"""
 		dom=xml.dom.minidom.parseString(geturl)
-	except:
-		return (None,"Cannot parse: "+url+"<br>"+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+"<br>"+geturl)
+
+	
 
 	metanodes=dom.getElementsByTagName('bib')
 
@@ -536,39 +554,50 @@ class ECHO_resource(Folder,Persistent):
     def getRDF(self,urn=None):
 	    """rdf"""
 	    ret=getRDFDescription(self,self.link,urn=urn)
-	    return ret+self.createSubElementRDF() 
+	    return ret+self.createSubElementRDF(urn=urn) 
 
 
-    def createSubElementRDF(self):
+    def createSubElementRDF(self,urn=None):
 	    """rdf list"""
-	    urn="urn:"+re.sub('/',':',self.absolute_url()) 
+	    if not urn:
+		    urn=self.absolute_url()
 	    ret=""
 
-	    rettemp="""<RDF:Seq about="%s">\n"""%urn
+	    rettemp="""<RDF:Seq RDF:about="%s">\n"""%urn
 	    flag=0
 	    
-	    li="""<RDF:li resource="%s" />\n"""
+	    li="""<RDF:li RDF:resource="%s" />\n"""
 	    if not ('<error>' in self.getFullTextXML(noredirect='Yes')):
-		    nurn="urn:"+re.sub('/',':',self.absolute_url()+'/getFullTextXML')
+		    nurn=self.absolute_url()+'/getFullTextXML'
 		    rettemp+=li%nurn
 		    flag=1
 	    if not ('<error>' in self.getImageView(noredirect='Yes')):
-		    nurn="urn:"+re.sub('/',':',self.absolute_url()+'/getImageView')
+		    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="urn:"+re.sub('/',':',self.absolute_url()+'/getFullTextXML')	
-		    ret+=getRDFDescription(self,self.absolute_url()+'/getFullTextXML',urn=nurn,nameDef="Fulltext")
+                    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="urn:"+re.sub('/',':',self.absolute_url()+'/getImageView')	
-		    ret+=getRDFDescription(self,self.absolute_url()+'/getImageView',urn=nurn,nameDef="Image View")
+                    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
 	    
@@ -589,7 +618,7 @@ class ECHO_resource(Folder,Persistent):
 	    else:
 		    ret=""
 		    for value in values:
-			    print
+			    
 			    if value==self.getAccessRightMD():
 				    ret+="""<input type="radio" name="%s" value="%s" checked>%s"""%(self.getId(),value,value)
 			    else:
@@ -1113,6 +1142,14 @@ class ECHO_resource(Folder,Persistent):
 	    except:
 		    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):
 	    """prints out metadata as stored in the echo environment, format is the index.meta format"""
 	    self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
@@ -1586,38 +1623,40 @@ class ECHO_collection(Folder, Persistent
 
     path="/mpiwg/online/permanent/shipbuilding"
 
-    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="urn:"+re.sub('/',':',self.absolute_url())
-	   
-	    li="""<RDF:li resource="%s" />\n"""
+		    urn=self.absolute_url()
+		    
+	    li="""<RDF:li RDF:resource="%s" />\n"""
 
 	    
 	    for content in contents:
 		    ret+=content[1].getRDF()+"\n"
 		    
-	    ret+="""<RDF:Seq about="%s">\n"""%urn
+	    ret+="""<RDF:Seq RDF:about="%s">\n"""%urn
 	    for content in contents:
-		    nurn="urn:"+re.sub('/',':',content[1].absolute_url())
+		    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)
@@ -2321,24 +2360,34 @@ class ECHO_group(ECHO_collection):
 	
 	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)
+	    ret=getRDFDescription(self,self.absolute_url(),urn=urn)
 
 	    
-
-	    urn="urn:"+re.sub('/',':',self.absolute_url())
-	    li="""<RDF:li resource="%s" />\n"""
+	    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 about="%s">\n"""%urn
+	    ret+="""<RDF:Seq RDF:about="%s">\n"""%urn
 	    for content in contents:
-		    nurn="urn:"+re.sub('/',':',content[1].absolute_url())
+		    nurn=content[1].absolute_url()
 		    ret+=li%nurn
 	    return ret+"</RDF:Seq>"
 	    
@@ -2574,15 +2623,15 @@ class ECHO_root(Folder,Persistent,Implic
 
 	    ret=getRDFDescription(self,self.absolute_url(),urn=urn)
 	    
-	    li="""<RDF:li resource="%s" />\n"""
+	    li="""<RDF:li RDF:resource="%s" />\n"""
 
 	    
 	    for content in contents:
 		    ret+=content[1].getRDF()+"\n"
 		    
-	    ret+="""<RDF:Seq about="%s">\n"""%urn
+	    ret+="""<RDF:Seq RDF:about="%s">\n"""%urn
 	    for content in contents:
-		    nurn="urn:"+re.sub('/',':',content[1].absolute_url())
+		    nurn=content[1].absolute_url()
 		    ret+=li%nurn
 	    return ret+"</RDF:Seq>"