--- ECHO_content/ECHO_collection.py 2007/07/19 14:13:13 1.290
+++ ECHO_content/ECHO_collection.py 2007/09/18 14:13:49 1.292
@@ -2016,10 +2016,10 @@ def manage_addECHO_linkForm(self):
return pt()
-def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,RESPONSE=None):
+def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,linkType="external",RESPONSE=None):
"""Add an external Link"""
- newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)
+ newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType)
self._setObject(id,newObj)
@@ -3755,7 +3755,10 @@ class ECHO_root(Folder,Persistent,Implic
def formatAscii(self,str,url=None):
"""ersetze ascii umbrueche durch
"""
- #url=None
+
+ if not str:
+ return ""
+
if url:
retStr=""
@@ -3767,9 +3770,10 @@ class ECHO_root(Folder,Persistent,Implic
retStr+="""%s
"""%(strUrl,word)
str=retStr
if str:
- return re.sub(r"[\n]","
",str)
+ str = re.sub(r"[\n]","
",str)
+ return unicodify(str)
else:
- return ""
+ return u""
link2html=vlp_xmlhelpers.link2html
related2html=vlp_xmlhelpers.related2html