--- ECHO_content/ECHO_collection.py 2004/09/01 14:32:32 1.168
+++ ECHO_content/ECHO_collection.py 2004/10/19 19:20:19 1.181
@@ -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
@@ -390,10 +398,11 @@ def writeMetadata(url,metadict,project=N
metanode.removeChild(nodeOld[0]).unlink()
metanodeneu=dom.createElement(metaData)
- try:
- metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8"))
- except:
- metanodetext=dom.createTextNode(metadict[metaData].encode('utf-8'))
+ metanodetext=dom.createTextNode(metadict[metaData])
+ #try:
+ #metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8"))
+ #except:
+ #metanodetext=dom.createTextNode(metadict[metaData].encode('utf-8'))
metanodeneu.appendChild(metanodetext)
metanode.appendChild(metanodeneu)
@@ -420,7 +429,10 @@ def writeMetadata(url,metadict,project=N
if digiliburlprefix:
updateTextToolNode('digiliburlprefix',digiliburlprefix)
- return dom.toxml().encode('utf-8')
+ try:
+ return dom.toxml().encode('utf-8')
+ except:
+ return dom.toxml('utf-8')
@@ -579,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
@@ -1028,6 +1040,7 @@ class ECHO_resource(Folder,Persistent):
path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server
path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
path=re.sub('http://vision.rz-berlin.mpg.de','',path) # falls vision als server
+ path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo
path=re.sub('/index.meta','',path)
@@ -1091,6 +1104,7 @@ class ECHO_resource(Folder,Persistent):
path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server
path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server
+ path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo
path=re.sub('http://vision.rz-berlin.mpg.de','',path) # falls vision als server
@@ -1129,15 +1143,29 @@ class ECHO_resource(Folder,Persistent):
def getFullTextXML(self,noredirect=None):
"""getFullTextXML; gives the FullText as an XML Document, and if somthing goes wrong."""
+
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()
+ zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh")
+ #keine url
+ if not (texturl.split(":")[0] in ['http','ftp','file']):
+ if not noredirect:
+ return file(texturl).read()
+ else:
+ return texturl
+
if not noredirect:
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+ zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl)
self.REQUEST.RESPONSE.redirect(texturl)
else:
return texturl
@@ -1163,6 +1191,8 @@ class ECHO_resource(Folder,Persistent):
archivepath=getText(text[0].childNodes)
archivepath=re.sub('/mpiwg/online/','',archivepath)
imageurl="http://echo.mpiwg-berlin.mpg.de/zogilib?fn="+archivepath+"/"+imagetemp
+ fh.close()
+
if not noredirect:
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
self.REQUEST.RESPONSE.redirect(imageurl)
@@ -2089,7 +2119,7 @@ class ECHO_collection(Folder, Persistent
pt=PageTemplateFile('Products/ECHO_content/zpt/changeViewerTemplateSet').__of__(self)
return pt()
- def getViewerTemplateSets(self,obj_ids=None):
+ def getViewerTemplateSets(self,obj_ids=None,RESPONSE=None):
"""Get the ViewerTemplateSet title for configuration"""
ret=[]
@@ -2098,7 +2128,7 @@ class ECHO_collection(Folder, Persistent
for viewerTemplateSet in viewerTemplateSets:
ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1]))
-
+
return ret
except:
@@ -2278,6 +2308,11 @@ class ECHO_collection(Folder, Persistent
def getCollectionTreeXML(self):
"""Tree as XML"""
+ def addPassWd(str):
+ """adds a user/passwd to an url"""
+ txt2=re.sub(r"(http://)(.*?)","\g<1>www:3333@\g<2>",str)
+ return txt2
+
def getCollection(object,depth=0):
depth+=1
collections=""
@@ -2285,7 +2320,7 @@ class ECHO_collection(Folder, Persistent
element=getattr(object,entry)
try:
if element.meta_type in ["ECHO_collection","ECHO_group"]:
- collections+=""
+ collections+=""
collections+=getCollection(element,depth)+"\n"
except:
"""nothing"""
@@ -2571,7 +2606,15 @@ class ECHO_collection(Folder, Persistent
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
+ def setAlwaysClickable(self,flag="yes"):
+ """set clickable"""
+ if flag=="yes":
+ self.isAlwaysClickable="yes"
+ else:
+ self.isAlwaysClickable=None
+ return flag
+
def showOverview(self):
"""overview"""
if 'ECHO_overview.html' in self.__dict__.keys():
@@ -2996,7 +3039,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)
@@ -3499,40 +3553,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("\&","&",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
@@ -3560,7 +3639,7 @@ class ECHO_root(Folder,Persistent,Implic
"""
for partner in partners:
- ret+="""\n"""%(partner.getId(),unicode(partner.title,'utf-8','replace'))
+ ret+="""\n"""%(partner.getId(),partner.title)
return ret+"\n"
@@ -3667,11 +3746,22 @@ class ECHO_root(Folder,Persistent,Implic
def getMetaDatasXML(self,viewerType=None,filter=None):
"""gebe all ressourcen aus"""
+ # check if the request's host part was OK
+ http_host = self.REQUEST['HTTP_HOST']
+ host_port = self.REQUEST['SERVER_PORT']
+ fix_host = None
+ if http_host and http_host.rfind(host_port) == -1:
+ print "HTTP_HOST needs fixing!"
+ fix_host = http_host + ":" + host_port
+
ret="""
"""
for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):
echo_url=resource[1].absolute_url()
+ if fix_host:
+ #print "replacing ", http_host, " by ", fix_host
+ echo_url = string.replace(echo_url, http_host, fix_host, 1)
if hasattr(resource[1],'link'):
meta_url=echo_url+"/getMetaDataXML"
@@ -3689,8 +3779,7 @@ class ECHO_root(Folder,Persistent,Implic
ret +="""\n"""
-
-
+
self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
self.REQUEST.RESPONSE.write(ret)