--- ECHO_content/ECHO_helpers.py	2008/08/21 07:44:56	1.88
+++ ECHO_content/ECHO_helpers.py	2008/09/08 19:02:30	1.90
@@ -420,19 +420,26 @@ class ECHO_basis:
         bt = BrowserCheck(self)
         id = ob.getFullId()
         link = ob.getLinkId()
+        if target is None:
+            targetattr = ""
+        else:
+            targetattr = 'target="%s"'%target
+             
         if text is None:
             text = ob.getLabel()
+            
         if text is None:
             text = "link"
+            
         tiptext = ob.getTip()
         tag = ""
         if bt.isN4:
             # N4 needs layer for highlighting
-            tag += '<ilayer id="a.%s"><a class="maplink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="%s"'%(id,id,id,link,target)
+            tag += '<ilayer id="a.%s"><a class="maplink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" %s'%(id,id,id,link,targetattr)
             tag += ">" + text + "</a></ilayer>"
         else:
             # a-element
-            tag = '<a id="a.%s" class="maplink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="%s"'%(id,id,id,link,target)
+            tag = '<a id="a.%s" class="maplink" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" %s'%(id,id,id,link,targetattr)
             if tiptext:
                 tag += ' title="%s"'%tiptext
             tag += ">" + text + "</a>"
@@ -633,10 +640,10 @@ def getSubCols(self, sortfield=None,
                                 return  cmp(x[0],y[0])
                         else:
                                 if type(x[0])==types.StringType:
-                                        tmpX=unicode(x[0])
+                                        tmpX=unicodify(x[0])
                                         tmpY=y[0]
                                 else:
-                                        tmpY=unicode(y[0])
+                                        tmpY=unicodify(y[0])
                                         tmpX=x[0]
                                 return cmp(tmpX,tmpY)