--- ECHO_content/ECHO_helpers.py	2010/10/11 13:15:00	1.103
+++ ECHO_content/ECHO_helpers.py	2012/01/03 13:02:31	1.104
@@ -20,6 +20,7 @@ import xmlrpclib
 import sys
 import logging
 import amara
+from xml.sax.saxutils import escape
 
 #erstzt logging
 def logger(txt,method,txt2):
@@ -143,8 +144,8 @@ class ECHO_basis:
     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#"
-            xmlns:MPIWG="http://www.mpiwg-berlin.mpg.de/ns/mpiwg">\n"""
+            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#"
+            xmlns:mpiwg="http://www.mpiwg-berlin.mpg.de/ns/mpiwg">\n"""
 
             ret+=self.getRDF(urn="echo:collectionroot")+"\n"
 
@@ -156,7 +157,7 @@ class ECHO_basis:
     def RDF(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="""<?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=self.absolute_url())+"\n"
 
@@ -862,11 +863,11 @@ def getRDFDescription(self,linkURL,urn=N
             about2=about%urn
             if not nameDef:
                     if hasattr(self,'label') and not (self.label==""):
-                            name2=name%self.label
+                            name2=name%escape(self.label)
                     elif not self.title=="":
-                            name2=name%self.title
+                            name2=name%escape(self.title)
                     else:
-                            name2=name%self.getId()
+                            name2=name%escape(self.getId())
 
                     name2=re.sub('&','&amp;',name2)
             else:
@@ -1081,12 +1082,13 @@ def writeMetadata(url,metadict,project=N
 
                 try:
                         dom=xml.dom.minidom.parseString(geturl)
+                        
                 except:
                     logger("ECHO writeMetadata",logging.ERROR,"Cannot parse: "+url+"<br>"+geturl)
                     return (None,"Cannot parse: "+url+"<br>"+geturl)
 
         
-
+        logging.debug("getting:"+geturl)
         metanodes=dom.getElementsByTagName('bib')
 
         if not metanodes:
@@ -1162,6 +1164,7 @@ def readMetadata(url):
     """Methode zum Auslesen der Metadateninformation zu einer Resource
     Vorerst noch Typ bib"""
     
+    logging.debug("getting:" +url)
     metadict={}
     
     try:
@@ -1197,7 +1200,7 @@ def readMetadata(url):
                 try:
                         #print urllib.unquote(getText(node.childNodes)),getText(node.childNodes)
                         #metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
-                        metadict[re.sub('-','_',node.tagName.lower())]=getText(node.childNodes)
+                        metadict[node.tagName]=getText(node.childNodes)
                 
                 except:
                         """nothing"""