--- ECHO_content/ECHO_collection.py	2004/09/01 19:11:36	1.169
+++ 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
 
@@ -1135,7 +1141,9 @@ class ECHO_resource(Folder,Persistent):
 		    texttools=dom.getElementsByTagName('texttool')
 		    text=texttools[0].getElementsByTagName('text')
 		    texturl=getText(text[0].childNodes)
-		    
+		    if not (texturl.split(":")[0] in ['http','ftp','file']): 
+           		    texturl=re.sub("//","/",texturl)	
+		    #return texturl+"::"+texturl.split(":")[0]
 		    if not noredirect:
                             self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')	
 			    self.REQUEST.RESPONSE.redirect(texturl)
@@ -2089,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=[]
 	    
@@ -2098,7 +2106,7 @@ class ECHO_collection(Folder, Persistent
             
 		    for viewerTemplateSet in viewerTemplateSets:
 			    ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1]))
-			    
+
 		    return ret
 		    
 	    except:
@@ -2278,6 +2286,11 @@ class ECHO_collection(Folder, Persistent
     def getCollectionTreeXML(self):
         """Tree as XML"""
 
+	def addPassWd(str):
+		"""adds a user/passwd to an url"""
+		txt2=re.sub(r"(http://)(.*?)","\g<1>www:3333@\g<2>",str)
+		return txt2
+
         def getCollection(object,depth=0):
             depth+=1
             collections=""
@@ -2285,7 +2298,7 @@ class ECHO_collection(Folder, Persistent
                 element=getattr(object,entry)
                 try:
                     if element.meta_type in ["ECHO_collection","ECHO_group"]:
-                        collections+="<element name=\""+quote(element.title)+"\" url=\""+element.absolute_url()+"\">"
+                        collections+="<element name=\""+quote(element.title)+"\" url=\""+addPassWd(element.absolute_url())+"\">"
                         collections+=getCollection(element,depth)+"</element>\n"
                 except:
                     """nothing"""
@@ -3568,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>"
     
@@ -3675,11 +3688,22 @@ class ECHO_root(Folder,Persistent,Implic
 
     def getMetaDatasXML(self,viewerType=None,filter=None):
 	    """gebe all ressourcen aus"""
+	    # check if the request's host part was OK
+	    http_host = self.REQUEST['HTTP_HOST']
+	    host_port = self.REQUEST['SERVER_PORT']
+	    fix_host = None
+	    if http_host and http_host.rfind(host_port) == -1:
+		    print "HTTP_HOST needs fixing!"
+		    fix_host = http_host + ":" + host_port
+
 	    ret="""<?xml version="1.0" ?>
 	             <index>"""
 	    for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):
 
 		    echo_url=resource[1].absolute_url()
+		    if fix_host:
+			    #print "replacing ", http_host, " by ", fix_host
+			    echo_url = string.replace(echo_url, http_host, fix_host, 1)
 		    
 		    if hasattr(resource[1],'link'):
 			    meta_url=echo_url+"/getMetaDataXML"
@@ -3697,8 +3721,7 @@ class ECHO_root(Folder,Persistent,Implic
 		    
 			    
 	    ret +="""\n</index>"""
-	    
-	    
+
 	    self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
 	    self.REQUEST.RESPONSE.write(ret)