--- ECHO_content/ECHO_collection.py	2004/07/20 16:24:44	1.148
+++ ECHO_content/ECHO_collection.py	2004/07/20 18:35:48	1.149
@@ -46,7 +46,7 @@ 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=""
@@ -77,7 +77,11 @@ def getRDFDescription(self,linkURL,urn=N
 	    linkURL2=re.sub('&','&',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"+clickable2+"\n</RDF:Description>"
 	    ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n</RDF:Description>"
@@ -223,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
@@ -241,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')
 
@@ -561,6 +576,12 @@ class ECHO_resource(Folder,Persistent):
 		    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:
@@ -568,11 +589,15 @@ class ECHO_resource(Folder,Persistent):
 		    
 	    if not ('<error>' in self.getFullTextXML(noredirect='Yes')):
                     nurn=self.absolute_url()+'/getFullTextXML'	
-		    ret+=getRDFDescription(self,self.absolute_url()+'/getFullTextXML',urn=nurn,nameDef="Fulltext")
+		    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")
+		    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
 	    
@@ -1117,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')