--- ECHO_content/ECHO_helpers.py	2005/03/07 20:05:38	1.45
+++ ECHO_content/ECHO_helpers.py	2005/06/08 10:23:16	1.49
@@ -6,6 +6,7 @@ import string
 import xml.dom.minidom
 import types
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from OFS.SimpleItem import SimpleItem
 from Globals import package_home
 import Globals
@@ -52,7 +53,18 @@ class ECHO_basis:
     	    return ret 
 
   
+    def RDF(self):
+	    """showrdf"""
+            self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+	    ret="""<?xml version="1.0" encoding="utf-8"?>\n<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
+
+	    ret+=self.getRDF(urn=self.absolute_url())+"\n"
+
+
+	    ret+="""</RDF:RDF>"""
+    	    return ret 
 
+  
     def createSubElementRDF(self,urn=None):
 	    """rdf list"""
 	    if not urn:
@@ -113,7 +125,15 @@ class ECHO_basis:
 	
     def getLabel(self):
 	"""title"""
-
+	if not hasattr(self,'label'):
+		self.label=""
+		
+	if self.label=="":
+		ret=self.getTitle()
+		if ret=="":
+			ret=self.getId()
+		return ret
+	
 	return self.decode(self.label)
 	try:
 		return self.label.encode('utf-8','ignore') 
@@ -246,7 +266,7 @@ class ECHO_basis:
 	"""generate img-tag for map of parent"""
 	return self.aq_parent.createMapImg()
 
-    def createMapLink(self, ob, text=None):
+    def createMapLink(self, ob, text=None, target="_blank"):
 	"""generate map link"""
 	bt = BrowserCheck(self)
 	id = ob.getFullId()
@@ -259,17 +279,17 @@ class ECHO_basis:
 	tag = ""
 	if bt.isN4:
 	    # N4 needs layer for highlighting
-	    tag += '<ilayer id="a.%s"><a onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank"'%(id,id,id,link)
+	    tag += '<ilayer id="a.%s"><a onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="%s"'%(id,id,id,link,target)
 	    tag += ">" + text + "</a></ilayer>"
 	else:
 	    # a-element
-	    tag = '<a id="a.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank"'%(id,id,id,link)
+	    tag = '<a id="a.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="%s"'%(id,id,id,link,target)
 	    if tiptext:
 		tag += ' title="%s"'%tiptext
 	    tag += ">" + text + "</a>"
 	return tag
 
-    def createMapAux(self, ob, arrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil"):
+    def createMapAux(self, ob, arrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil",target="_blank"):
 	"""generate map link image, text and other stuff"""
 	bt = BrowserCheck(self)
 	id = ob.getFullId()
@@ -291,7 +311,7 @@ class ECHO_basis:
 	    tag += '</layer>'
 	else:
 	    # create a-element
-	    tag = '<a id="b.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank">'%(id,id,id,link)
+	    tag = '<a id="b.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="%s">'%(id,id,id,link,target)
 	    if ob.isTypeArrow():
 		rot = ob.angle
 		if bt.isIEWin and bt.versIE > 5:
@@ -629,6 +649,7 @@ def findObjectPath(startobject, filename
     paths = filename.split('/')
     object = startobject
     for path in paths:
+	    
         if hasattr(object, path):
 	    object = getattr(object, path)
 	else:
@@ -953,3 +974,64 @@ class MapArea(SimpleItem):
 # call this to initialize framework classes, which
 # does the right thing with the security assertions.
 Globals.InitializeClass(MapArea)
+
+
+class MapText(ZopePageTemplate):
+    """class to hold text for map areas"""
+
+    meta_type = 'ECHO_mapText'
+    # Create a SecurityInfo for this class.
+    security = ClassSecurityInfo()
+    security.setDefaultAccess("allow")
+	
+    _default_content_fn = os.path.join(package_home(globals()),
+                                       'zpt', 'ECHO_mapText_default.html')
+
+    def __init__(self, id, text=None, content_type=None):
+        self.id = str(id)
+        self.ZBindings_edit(self._default_bindings)
+        if text is None:
+            text = open(self._default_content_fn).read()
+        self.pt_edit(text, content_type)
+
+# Product registration and Add support
+manage_addMapTextForm = PageTemplateFile(
+    'zpt/AddECHO_mapText', globals(), __name__='manage_addMapTextForm')
+
+def manage_addMapText(self, id, title=None, text=None,
+                           REQUEST=None, submit=None):
+    "Add a Map Text with optional file content."
+
+    id = str(id)
+    if REQUEST is None:
+        self._setObject(id, MapText(id, text))
+        ob = getattr(self, id)
+        if title:
+            ob.pt_setTitle(title)
+        return ob
+    else:
+        file = REQUEST.form.get('file')
+        headers = getattr(file, 'headers', None)
+        if headers is None or not file.filename:
+            zpt = MapText(id, text)
+        else:
+            zpt = MapText(id, file, headers.get('content_type'))
+
+        self._setObject(id, zpt)
+        if title:
+            ob = getattr(self, id)
+            ob.pt_setTitle(title)
+
+        try:
+            u = self.DestinationURL()
+        except AttributeError:
+            u = REQUEST['URL1']
+
+        if submit == " Add and Edit ":
+            u = "%s/%s" % (u, urllib.quote(id))
+        REQUEST.RESPONSE.redirect(u+'/manage_main')
+    return ''
+
+# call this to initialize framework classes, which
+# does the right thing with the security assertions.
+Globals.InitializeClass(MapText)