--- ECHO_content/ECHO_helpers.py	2009/04/14 16:31:27	1.97
+++ ECHO_content/ECHO_helpers.py	2009/04/20 20:24:39	1.100
@@ -19,6 +19,7 @@ import bz2
 import xmlrpclib
 import sys
 import logging
+import amara
 
 #erstzt logging
 def logger(txt,method,txt2):
@@ -142,25 +143,25 @@ 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#"
+            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"
 
 
-            ret+="""</RDF:RDF>"""
+            ret+="""</rdf:RDF>"""
             return ret 
 
   
     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"
 
 
-            ret+="""</RDF:RDF>"""
+            ret+="""</rdf:RDF>"""
             return ret 
 
   
@@ -170,10 +171,10 @@ class ECHO_basis:
                     urn=self.absolute_url()
             ret=""
 
-            rettemp="""<RDF:Seq RDF:about="%s">\n"""%urn
+            rettemp="""<rdf:Seq rdf:about="%s">\n"""%urn
             flag=0
             
-            li="""<RDF:li RDF:resource="%s" />\n"""
+            li="""<rdf:li rdf:resource="%s" />\n"""
             if not ('<error>' in self.getFullTextXML(noredirect='Yes')):
                     nurn=self.absolute_url()+'/getFullTextXML'
                     rettemp+=li%nurn
@@ -189,7 +190,7 @@ class ECHO_basis:
                     rettemp+=li%nurn
                     flag=1
                     
-            rettemp+="</RDF:Seq>"
+            rettemp+="</rdf:Seq>"
 
             if flag==1:
                     ret+=rettemp
@@ -653,7 +654,17 @@ def readFieldFromXML(meta_url,parent,fie
 
         return getText(field[0].childNodes)
         
-        
+def readFieldFromXML_xpath(meta_url,xpath):
+    """xpath auf meta_url"""
+    #logging.debug("try to parse:"+meta_url)
+    #logging.debug("Xtry to parse xpath:"+xpath)
+    doc = amara.parse(meta_url)
+    #logging.debug("have:"+doc.xml())
+    node= doc.xml_xpath(xpath)
+    if node is None:
+        return None
+    
+    return unicode(node[0])
               
 def urlopen(url):
         """urlopen mit timeout"""
@@ -826,19 +837,19 @@ def getRDFDescription(self,linkURL,urn=N
             """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>"""
+            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"/>"""      
+            #xlink="""<echonavigation:xlink xlink:href="%s"/>"""      
             
             if ap=="":
                 ap2=""
             else:
-                ap2 = """<MPIWG:archive-path>%s</MPIWG:archive-path>"""%ap
+                ap2 = """<mpiwg:archive-path>%s</mpiwg:archive-path>"""%ap
             
             if not urn:
                     #urn="urn:"+re.sub('/',':',self.absolute_url())
@@ -867,8 +878,13 @@ def getRDFDescription(self,linkURL,urn=N
                     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"+ap2+"\n</RDF:Description>"
+	    try:
+            	ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n"+ap2+"\n</RDF:Description>"
+	    except:
+            	ret=self.unicodify(about2)+"\n"+self.unicodify(name2)+"\n"+self.unicodify(type2)+"\n"+self.unicodify(clickable2)+"\n"+self.unicodify(ap2)+"\n</RDF:Description>"
+
             return ret
     
 def getCopyrightsFromForm(self,argv):