--- ECHO_content/ECHO_helpers.py	2012/01/19 19:03:28	1.103.2.4
+++ ECHO_content/ECHO_helpers.py	2012/08/27 09:45:33	1.103.2.5
@@ -264,12 +264,9 @@ class ECHO_basis:
                 locale=self.ZopeFind(self,obj_ids=["locale_"+lang])
 
         if locale:
-                return self.decode(locale[0][1].title)
-        else:
-            try:
-                return self.decode(self.title)
-            except:    
-                return self.title
+                return unicodify(locale[0][1].title)
+                
+        return unicodify(self.title)
         
     def getLabel(self):
         """title"""
@@ -296,7 +293,7 @@ class ECHO_basis:
                         ret=self.getId()
                 return ret
         
-        return self.decode(self.label)
+        return unicodify(self.label)
       
     def changeECHOEntriesForm(self):
         """change Entries for the ECHO Navigation environment"""
@@ -373,7 +370,7 @@ class ECHO_basis:
                 res = self.ZopeFind(self, obj_metatypes=('ECHO_mapText'))
         if len(res) > 0:
             text = res[0][1]
-            return text
+            return unicodify(text)
         return None
 
     def ECHO_graphicEntry(self):
@@ -481,6 +478,7 @@ class ECHO_basis:
             text = "link"
             
         tiptext = ob.getTip()
+
         tag = ""
         if bt['isN4']:
             # N4 needs layer for highlighting
@@ -491,7 +489,10 @@ class ECHO_basis:
             tag = '<a id="a.%s" class="maplink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" %s %s'%(id,id,id,href,targetattr)
             if tiptext:
                 tag += ' title="%s"'%tiptext
-            tag += ">" + text + "</a>"
+
+            logging.debug("createMapLink: text=%s"%repr(text))
+            tag += ">%s</a>"%text
+
         return tag
 
     def createMapAux(self, ob, arrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil", circlesrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/kreis", target="_blank",backLink=None,alternativArrowsrc="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?dw=15&fn=icons/pfeil_blau"):
@@ -511,8 +512,8 @@ class ECHO_basis:
         else:
             targetattr = 'target="%s"'%target
         tiptext = ob.getTip()
-        tag = ""
 
+        tag = ""
         if bt['isN4']:
             #
             # N4 needs layer and img elements
@@ -1273,16 +1274,23 @@ class MapArea(SimpleItem):
         if self.tip is None:
             if hasattr(self, 'aq_parent'):
                 parent = self.aq_parent
+                # text-popup type
                 if parent.contentType == 'text-popup':
-                    return parent.description
-        return self.tip
+                    return unicodify(parent.description)
+
+                # use map-text
+                text = parent.getMapText()
+                if text is not None:
+                    return text()
+
+        return unicodify(self.tip)
 
     def setTip(self, text):
         """sets the text"""
         self.tiptext = text
 
     def getText(self):
-        """returns the text fpr the area"""
+        """returns the text for the area"""
         if hasattr(self, 'aq_parent'):
             parent = self.aq_parent
             text = parent.getMapText()
@@ -1295,8 +1303,8 @@ class MapArea(SimpleItem):
         """returns the link label"""
         if self.label is None:
             if hasattr(self, 'aq_parent'):
-                return self.aq_parent.label or self.aq_parent.id
-        return self.label
+                return unicodify(self.aq_parent.label or self.aq_parent.id)
+        return unicodify(self.label)
 
     def getTargetUrl(self):
         """returns the URL of the linked object"""