--- ECHO_content/ECHO_helpers.py	2005/03/22 20:50:21	1.46
+++ ECHO_content/ECHO_helpers.py	2005/06/08 07:07:27	1.48
@@ -124,7 +124,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') 
@@ -257,7 +265,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()
@@ -270,17 +278,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()
@@ -302,7 +310,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:
@@ -640,6 +648,7 @@ def findObjectPath(startobject, filename
     paths = filename.split('/')
     object = startobject
     for path in paths:
+	    
         if hasattr(object, path):
 	    object = getattr(object, path)
 	else: