--- ECHO_content/ECHO_collection.py 2004/10/05 09:30:46 1.174 +++ ECHO_content/ECHO_collection.py 2004/10/05 14:58:56 1.175 @@ -3536,14 +3536,17 @@ class ECHO_root(Folder,Persistent,Implic 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 + + cns=link.childNodes[0:] newLink=dom.createElementNS(EMPTY_NAMESPACE,"a") - for cn in cns: - newLink.appendChild(cn) + for x in cns: + newLink.appendChild(x) + + link.parentNode.replaceChild(newLink,link) if self.checkRef(ref): @@ -3568,12 +3571,15 @@ class ECHO_root(Folder,Persistent,Implic return "" def checkRef(self,ref): - dbs={'vl_literature':'AND CD LIKE \'%lise%\'','vl_technology':'','vl_people':'','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 + if ref[0:3]=='lit': + if len(self.library_data({ 'id':ref}))>0: + return 1 + + dbs={'vl_technology':'','vl_people':'','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