--- ECHO_content/ECHO_collection.py	2004/07/01 15:11:04	1.133
+++ ECHO_content/ECHO_collection.py	2004/07/14 14:48:59	1.138
@@ -650,7 +650,8 @@ class ECHO_resource(Folder,Persistent):
 
 	    path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
 	    path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server
-
+	    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('/index.meta','',path) 
 
 
@@ -710,6 +711,8 @@ class ECHO_resource(Folder,Persistent):
   	    path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
 	    path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server
 
+	    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
 
 	    return urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
 
@@ -719,12 +722,20 @@ class ECHO_resource(Folder,Persistent):
     
     def getTitle(self):
 	"""title"""
-	return self.title.decode('utf-8','ignore') 
-
+	try:
+		return self.title.encode('utf-8','ignore') 
+	except:
+		self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.title.encode('utf-8','ignore') 
+	
     def getLabel(self):
 	"""title"""
-	return self.label.decode('utf-8','ignore') 
-
+	try:
+		return self.label.encode('utf-8','ignore') 
+	except:
+		self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.label.encode('utf-8','ignore') 
+	
     def content_html(self):
         """template fuer content"""
         return content_html(self,'resource')
@@ -743,8 +754,9 @@ class ECHO_resource(Folder,Persistent):
 		    texttools=dom.getElementsByTagName('texttool')
 		    text=texttools[0].getElementsByTagName('text')
 		    texturl=getText(text[0].childNodes)
-		    self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+		    
 		    if not noredirect:
+                            self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')	
 			    self.REQUEST.RESPONSE.redirect(texturl)
 		    else:
 			    return texturl
@@ -1329,11 +1341,19 @@ class ECHO_externalLink(Folder):
 
     def getTitle(self):
 	"""title"""
-	return self.title.encode('utf-8') 
-
+	try:
+		return self.title.encode('utf-8','ignore') 
+	except:
+		self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.title.encode('utf-8','ignore') 
+	
     def getLabel(self):
 	"""title"""
-	return self.label.encode('utf-8') 
+	try:
+		return self.label.encode('utf-8','ignore') 
+	except:
+		self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.label.encode('utf-8','ignore') 
 
     def content_html(self):
         """template fuer content"""
@@ -1662,14 +1682,20 @@ class ECHO_collection(Folder, Persistent
 
     def getTitle(self):
 	"""title"""
-	return self.title.encode('utf-8') 
-
+	try:
+		return self.title.encode('utf-8','ignore') 
+	except:
+		self.title=self.title.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.title.encode('utf-8','ignore') 
+	
     def getLabel(self):
 	"""title"""
-	return self.label.encode('utf-8') 
-
-    
-	    
+	try:
+		return self.label.encode('utf-8','ignore') 
+	except:
+		self.label=self.label.decode('iso-8859-1','ignore')[0:] #correnct conding error
+		return self.label.encode('utf-8','ignore')
+	
     def createRessourcesFromXMLForm(self):
 	    """form"""
 	    pt=PageTemplateFile('Products/ECHO_content/zpt/createRessourcesFromXMLForm.zpt').__of__(self)
@@ -1689,6 +1715,7 @@ class ECHO_collection(Folder, Persistent
 		    ret+="<p>"+label+"</p>"
 		    manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
 	    return ret
+    
     def getImageTag(self):
         """GetTag"""
         try:
@@ -2815,16 +2842,17 @@ class ECHO_root(Folder,Persistent,Implic
 	    for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):
 
 		    echo_url=resource[1].absolute_url()
-		    if resource[1].getFullTextXML(noredirect="yes"):
-			    if hasattr(resource[1],'link'):
-				    viewer_url=echo_url+"/getMetaDataXML"
-			    else:
-				    viewer_url="NO URL"
-			    if filter:
-				    if re.search(filter,viewer_url):
-					    ret+="""\n<resource echoLink="%s" viewerLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?'))
-			    else:
-				    ret+="""\n<resource echoLink="%s" viewerLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?'))
+		    
+		    if hasattr(resource[1],'link'):
+			    meta_url=echo_url+"/getMetaDataXML"
+		    else:
+			    meta_url="NO_URL"
+			    
+		    if filter and not re.search(filter,viewer_url):
+			    continue
+
+		    ret+="""\n<resource resourceLink="%s" metaLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(meta_url,safe='/:?'))
+			    
 	    ret +="""\n</index>"""