--- ECHO_content/ECHO_collection.py	2004/07/07 13:56:57	1.135
+++ ECHO_content/ECHO_collection.py	2004/07/08 15:23:20	1.136
@@ -1711,6 +1711,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:
@@ -2837,16 +2838,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>"""