--- ECHO_content/ECHO_collection.py	2004/10/04 12:57:19	1.172
+++ ECHO_content/ECHO_collection.py	2004/10/18 17:00:09	1.179
@@ -31,7 +31,15 @@ from Globals import Persistent, package_
 from Acquisition import Implicit
 from ECHO_helpers import displayTypes
 import urllib
+import smtplib
 import time
+from Ft.Xml.Domlette import NonvalidatingReader
+from Ft.Xml.Domlette import PrettyPrint
+from Ft.Xml import EMPTY_NAMESPACE
+
+import Ft.Xml.XPath
+import cStringIO
+import zLOG
 
 try:
 	from psycopg import libpq
@@ -583,7 +591,7 @@ class ECHO_layoutTemplate(ZopePageTempla
 
 def manage_addECHO_layoutTemplateForm(self):
     """Form for adding"""
-    pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_layoutTemplate.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/AddECHO_layoutTemplate.zpt')).__of__(self)
     return pt()
 
 from urllib import quote
@@ -1135,12 +1143,17 @@ class ECHO_resource(Folder,Persistent):
 
     def getFullTextXML(self,noredirect=None):
 	    """getFullTextXML; gives the FullText as an XML Document, and <error></error> if somthing goes wrong."""
+            zLOG.LOG("ECHO Fulltext",zLOG.INFO,"open %s"%self.metalink)	
 	    try:
+		    zLOG.LOG("ECHO Fulltext",zLOG.INFO,"open %s"%self.metalink)
 		    fh=ECHO_helpers.urlopen(self.metalink)
+		    zLOG.LOG("ECHO Fulltext",zLOG.INFO,"opened %s"%self.metalink)
 		    dom=xml.dom.minidom.parse(fh)
 		    texttools=dom.getElementsByTagName('texttool')
 		    text=texttools[0].getElementsByTagName('text')
 		    texturl=getText(text[0].childNodes)
+		    zLOG.LOG("ECHO Fulltext",zLOG.INFO,"found %s"%texturl)
+                    fh.close()
 		    if not (texturl.split(":")[0] in ['http','ftp','file']): 
            		    texturl=re.sub("//","/",texturl)	
 		    #return texturl+"::"+texturl.split(":")[0]
@@ -3017,7 +3030,18 @@ class ECHO_root(Folder,Persistent,Implic
 	#return "http://enlil.museum.upenn.edu/cgi-bin/cdlget.plx?item=%s&project=ncdl"
     ###END CDLI add
 
-    
+    def sendForm(self,fromaddr,content,server='mail.mpiwg-berlin.mpg.de'):
+	    """sendform"""
+	    toaddrs=["dwinter@mpiwg-berlin.mpg.de"]
+	    
+	    msg = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n"
+		   % (fromaddr, ", ".join(toaddrs),"testsub"))
+	    server = smtplib.SMTP(server)
+	    #server.set_debuglevel(1)
+	    msg=msg+content
+	    server.sendmail(fromaddr, toaddrs, msg)
+	    server.quit()
+		 
     def generateFromRDFForm(self):
 		"""change form"""
 		pt=PageTemplateFile('Products/ECHO_content/zpt/generateFromRDFForm').__of__(self)
@@ -3520,40 +3544,65 @@ class ECHO_root(Folder,Persistent,Implic
 
     def xml2html(self,str,quote="yes"):
         """link2html fuer VLP muss hier noch raus"""
-	#print str
 
         if str:
             if quote=="yes2":
                 str=re.sub("\&","&amp;",str)
-            dom=xml.dom.minidom.parseString(str)
-            links=dom.getElementsByTagName("link")
-            
+            #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.getAttribute("ref")
-		pn=link.getAttribute("page")
+                #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:
-				link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref+"&p="+pn)
+				newLink.setAttributeNS(EMPTY_NAMESPACE,"href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref+"&p="+pn)
 			else:
-				link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
+				newLink.setAttributeNS(EMPTY_NAMESPACE,"href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
 
-            str= dom.toxml()
-	    
+            #str= dom.toxml('utf-8')
+	    buf = cStringIO.StringIO()
+	    PrettyPrint(dom, stream=buf, encoding='UTF-8')
+	    str = buf.getvalue()
+	    buf.close()
+	    #str=PrettyPrint(dom.documentElement,encoding='UTF-8')
 	    #print link.toxml('utf-8')
+	    #print type(str)
 	    retStr=regexpPage.search(str)
-
-	    return retStr.group(1)
+	    try: # hack warum fehtl manchmal page??
+		    return retStr.group(1)
+	    except:
+		    return str
         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
+	    try:
+		    if ref[0:7]=="tec_cat":
+			    return 1
+	    except:
+		    """nothing"""
+		    
+	    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