--- ECHO_content/ECHO_collection.py	2005/10/23 09:46:26	1.238
+++ ECHO_content/ECHO_collection.py	2005/10/26 11:18:19	1.239
@@ -67,12 +67,7 @@ import ECHO_helpers
 from ECHO_helpers import *
 from ECHO_language import *
 from ECHO_movie import *
-
-#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)
+import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
 
             
 
@@ -3154,100 +3149,29 @@ class ECHO_root(Folder,Persistent,Implic
         else:
             return ""
         
-    def link2html(self,str):
-        """link2html fuer VLP muss hier noch raus"""
-        if str:
-
-            str=re.sub("\&","&amp;",str)
-            dom=xml.dom.minidom.parseString("<?xml version='1.0' encoding='utf-8'?><txt>"+str+"</txt>")
-            links=dom.getElementsByTagName("link")
-            
-
-            for link in links:
-                link.tagName="a"
-                ref=link.getAttribute("ref")
-                pn=link.getAttribute("page")
-                        
-                if self.checkRef(ref):
-                        if pn:
-                                link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref+"&page="+pn)
-                        else:
-                                link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref)
-
-
-            newxml=dom.toxml('utf-8')
-          
-            retStr=regexpTXT.search(newxml)
-
-            return retStr.group(1)
-
-                           
-        return ""
-
-    def xml2html(self,str,quote="yes"):
-        """link2html fuer VLP muss hier noch raus"""
-
-        if str:
-            if quote=="yes2":
-                str=re.sub("\&","&amp;",str)
-            #dom=xml.dom.minidom.parseString(str)
-            dom = NonvalidatingReader.parseString(str,"http://www.mpiwg-berlin.mpg.de/")
-            #links=dom.getElementsByTagName("link")
-            links=Ft.Xml.XPath.Evaluate(".//link", contextNode=dom)
-            for link in links:
-                #link.tagName="a"
-        
-                ref=link.getAttributeNS(EMPTY_NAMESPACE,"ref")
-                pn=link.getAttributeNS(EMPTY_NAMESPACE,"page")
-
-                cns=link.childNodes[0:]
-                
-                newLink=dom.createElementNS(EMPTY_NAMESPACE,"a")
-                for x in cns:
-                        newLink.appendChild(x)
-                
-                        
-                
-                link.parentNode.replaceChild(newLink,link)
-                if self.checkRef(ref):
-                        if pn:
-                                newLink.setAttributeNS(EMPTY_NAMESPACE,"href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref+"&p="+pn)
-                        else:
-                                newLink.setAttributeNS(EMPTY_NAMESPACE,"href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
-
-            #str= dom.toxml('utf-8')
-            buf = cStringIO.StringIO()
-            PrettyPrint(dom, stream=buf)
-            str = buf.getvalue()
-            buf.close()
-            #str=PrettyPrint(dom.documentElement,encoding='UTF-8')
-            #print link.toxml('utf-8')
-            #print type(str)
-            retStr=regexpPage.search(str)
-            
-            try: # hack warum fehtl manchmal page??
-                    return retStr.group(1)
-            except:
-                    return str
-        return ""
+    link2html=vlp_xmlhelpers.link2html
 
-    def checkRef(self,ref):
-            if ref[0:3]=='lit':
-                    if len(self.library_data({ 'id':ref}))>0:
-                            return 1
-            try:
-                    if ref[0:7]=="tec_cat":
-                            return 1
-            except:
-                    """nothing"""
-                    
-            dbs={'vl_technology':'','vl_people':" AND complete='yes'",'vl_sites':''}
-            res=None
-            for db in dbs.keys():
-                    res=res or self.search(var=str("select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db])))
-            return res
-                                    
-    #Ende Methode fuer vlp
+    xml2html=vlp_xmlhelpers.xml2html
+ 
+    checkRef=vlp_xmlhelpers.checkRef
+    
+#    def checkRef(self,ref):
+#            if ref[0:3]=='lit':
+#                    if len(self.library_data({ 'id':ref}))>0:
+#                            return 1
+#            try:
+#                    if ref[0:7]=="tec_cat":
+#                            return 1
+#            except:
+#                    """nothing"""
+#                    
+#            dbs={'vl_technology':'','vl_people':" AND complete='yes'",'vl_sites':''}
+#            res=None
+#            for db in dbs.keys():
+#                    res=res or self.search(var=str("select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db])))
+#            return res
+#                                    
+#    #Ende Methode fuer vlp
 
     def PgQuoteString(self,string):
         """Quote string"""