--- ECHO_content/ECHO_collection.py	2004/08/05 20:29:23	1.161
+++ ECHO_content/ECHO_collection.py	2004/08/09 10:10:56	1.162
@@ -48,6 +48,13 @@ import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain
 import ECHO_helpers
 
+#regexp for extracting elements from xml
+patternTXT=r"<\s*txt.*?>(.*?)</txt>"
+regexpTXT = re.compile(patternTXT, re.IGNORECASE + re.DOTALL)
+patternPage=r"<\s*page.*?>(.*?)</page>"
+regexpPage = re.compile(patternPage, re.IGNORECASE + re.DOTALL)
+
+	    
 def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
         """Rerender all Links"""
 	ret=""
@@ -3051,10 +3058,11 @@ class ECHO_root(Folder,Persistent,Implic
                     link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
 
             newxml=dom.toxml('utf-8')
-	    match=re.sub(r'<\?xml version=\"1.0\" encoding=\"utf-8\"\?>\n<txt>','',newxml)
-	    match=re.sub(r'</txt>','',match)
-	    
-	    return match
+	  
+	    retStr=regexpTXT.search(newxml)
+
+	    return retStr.group(1)
+
 			   
         return ""
 
@@ -3073,7 +3081,11 @@ class ECHO_root(Folder,Persistent,Implic
                 if self.checkRef(ref):
                     link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
 
-            return dom.toxml('utf-8')
+            str= dom.toxml('utf-8')
+	    #print str
+	    retStr=regexpPage.search(str)
+
+	    return retStr.group(1)
         return ""
 
     def checkRef(self,ref):