--- ECHO_content/ECHO_collection.py	2004/09/28 15:00:08	1.171
+++ ECHO_content/ECHO_collection.py	2004/10/04 12:57:19	1.172
@@ -390,10 +390,11 @@ def writeMetadata(url,metadict,project=N
 				metanode.removeChild(nodeOld[0]).unlink()
 
 		metanodeneu=dom.createElement(metaData)
-		try:
-			metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8"))
-		except:
-			metanodetext=dom.createTextNode(metadict[metaData].encode('utf-8'))
+                metanodetext=dom.createTextNode(metadict[metaData])
+		#try:
+			#metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8"))
+		#except:
+			#metanodetext=dom.createTextNode(metadict[metaData].encode('utf-8'))
 		metanodeneu.appendChild(metanodetext)
 		metanode.appendChild(metanodeneu)
 
@@ -420,7 +421,10 @@ def writeMetadata(url,metadict,project=N
 	if digiliburlprefix:
 		updateTextToolNode('digiliburlprefix',digiliburlprefix)
 	
-	return dom.toxml().encode('utf-8')
+        try:	
+	 return dom.toxml().encode('utf-8')
+	except:
+	 return dom.toxml('utf-8')
 
 	
 	
@@ -1028,6 +1032,7 @@ class ECHO_resource(Folder,Persistent):
             path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server
 	    path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
 	    path=re.sub('http://vision.rz-berlin.mpg.de','',path) # falls vision als server
+	    path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo
 	    path=re.sub('/index.meta','',path) 
 
 
@@ -1091,6 +1096,7 @@ class ECHO_resource(Folder,Persistent):
 	    path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server
 	    path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
 	    path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server
+	    path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo
 
 	    path=re.sub('http://vision.rz-berlin.mpg.de','',path) # falls vision als server
 
@@ -2091,7 +2097,7 @@ class ECHO_collection(Folder, Persistent
 	    pt=PageTemplateFile('Products/ECHO_content/zpt/changeViewerTemplateSet').__of__(self)
             return pt()
 
-    def getViewerTemplateSets(self,obj_ids=None):
+    def getViewerTemplateSets(self,obj_ids=None,RESPONSE=None):
 	    """Get the ViewerTemplateSet title for configuration"""
 	    ret=[]
 	    
@@ -2100,7 +2106,7 @@ class ECHO_collection(Folder, Persistent
             
 		    for viewerTemplateSet in viewerTemplateSets:
 			    ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1]))
-			    
+
 		    return ret
 		    
 	    except:
@@ -3575,7 +3581,7 @@ class ECHO_root(Folder,Persistent,Implic
 	<partners>"""
         
 	for partner in partners:
-            ret+="""<partner id="%s" title="%s"/>\n"""%(partner.getId(),unicode(partner.title,'utf-8','replace'))
+            ret+="""<partner id="%s" title="%s"/>\n"""%(partner.getId(),partner.title)
 
         return ret+"\n</partners>"