--- ECHO_content/ECHO_helpers.py	2004/12/02 12:01:08	1.29
+++ ECHO_content/ECHO_helpers.py	2004/12/02 15:44:26	1.30
@@ -1,3 +1,4 @@
+import re
 import string
 import socket
 import urllib
@@ -536,12 +537,12 @@ def writeMetadata(url,metadict,project=N
 	else:
 		try:
 			geturl=""
-			for line in ECHO_helpers.urlopen(url).readlines():
+			for line in urlopen(url).readlines():
 				geturl=geturl+line
 
 
 		except:
-			return (None,"Cannot open: "+url)
+			return (None,"XCannot open: "+url)
 
 		try:
 			dom=xml.dom.minidom.parseString(geturl)
@@ -620,9 +621,10 @@ def readMetadata(url):
     Vorerst noch Typ bib"""
     
     metadict={}
+    
     try:
         geturl=""
-        for line in ECHO_helpers.urlopen(url).readlines():
+        for line in urlopen(url).readlines():
             geturl=geturl+line
         
         
@@ -632,7 +634,7 @@ def readMetadata(url):
     try:
         dom=xml.dom.minidom.parseString(geturl)
     except:
-        return (None,"Cannot parse: "+url+"<br>"+geturl)
+	    return (None,"Cannot parse: "+url+"<br>"+geturl)
 
     metanode=dom.getElementsByTagName('bib')
     metadict['bib_type']='Book'
@@ -650,11 +652,11 @@ def readMetadata(url):
             """nothing"""
         
         for node in metacontent:
-            try:
-		    #print urllib.unquote(getText(node.childNodes)),getText(node.childNodes)
-		    metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
-            except:
-                """nothing"""
+		try:
+			#print urllib.unquote(getText(node.childNodes)),getText(node.childNodes)
+			metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
+		except:
+			"""nothing"""
 
 
     return metadict,""