--- ECHO_content/ECHO_collection.py	2004/04/16 15:42:52	1.45
+++ ECHO_content/ECHO_collection.py	2004/04/18 19:40:13	1.48
@@ -266,6 +266,13 @@ class ECHO_resource(Folder):
     viewClassificationList=viewClassificationListMaster
 
     getSubCols = ECHO_helpers.getSubCols
+    def getTitle(self):
+	"""title"""
+	return self.title.encode('utf-8') 
+
+    def getLabel(self):
+	"""title"""
+	return self.label.encode('utf-8') 
 
     def content_html(self):
         """template fuer content"""
@@ -436,6 +443,14 @@ class ECHO_externalLink(Folder):
     security=ClassSecurityInfo()
     meta_type='ECHO_externalLink'
 
+    def getTitle(self):
+	"""title"""
+	return self.title.encode('utf-8') 
+
+    def getLabel(self):
+	"""title"""
+	return self.label.encode('utf-8') 
+
     def content_html(self):
         """template fuer content"""
         return content_html(self,'externalLink')
@@ -525,6 +540,14 @@ class ECHO_collection(Folder, Persistent
     security=ClassSecurityInfo()
     meta_type='ECHO_collection'
 
+    def getTitle(self):
+	"""title"""
+	return self.title.encode('utf-8') 
+
+    def getLabel(self):
+	"""title"""
+	return self.label.encode('utf-8') 
+
     def createRessourcesFromXMLForm(self):
 	    """form"""
 	    pt=PageTemplateFile('Products/ECHO_content/zpt/createRessourcesFromXMLForm.zpt').__of__(self)
@@ -541,7 +564,7 @@ class ECHO_collection(Folder, Persistent
 		    id=re.sub(" ","_",label).encode('ascii')
 		    
 		    ret+="<p>"+label+"</p>"
-		    manage_addECHO_resource(self,id,label,label,"","","",link,"","")
+		    manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
 	    return ret
     def getImageTag(self):
         """GetTag"""
@@ -597,7 +620,11 @@ class ECHO_collection(Folder, Persistent
 
         dynamical=""
         for ob in self.getGraphicCoords():
-            dynamical+="""Coords.push(new Coord('%s', Img, %s));\n"""%(ob[1],ob[0])
+	    if ob[4][4] == "":	
+	        dynamical+="""Coords.push(new Coord('%s', Img, %s));\n"""%(ob[1],ob[0])
+	    else:
+	        dynamical+="""Coords.push(new Coord('%s', Img, %s));//%s\n"""%(ob[1],ob[0],ob[4][4])
+		dynamical+="ShowArrow(new getObj('i.%s'),Img,%s);\n"%(ob[1],ob[0])
         ret+=javaHandler%dynamical
         return ret
     
@@ -822,14 +849,14 @@ class ECHO_collection(Folder, Persistent
                         if len(coordtemp)>3:
                             coord=coordtemp[0:4]
                             if hasattr(object,'label') and not object.label=="":
-                                ids.append([string.join(coord,", "),object.getId(),object.label,object])
+                                ids.append([string.join(coord,", "),object.getId(),object.label,object,coordtemp])
                             elif hasattr(object,'title'):
                                 if not object.title=="":
-                                    ids.append([string.join(coord,", "),object.getId(),object.title,object])
+                                    ids.append([string.join(coord,", "),object.getId(),object.title,object,coordtemp])
                                 else:
-                                    ids.append([string.join(coord,", "),object.getId(),object.getId(),object])
+                                    ids.append([string.join(coord,", "),object.getId(),object.getId(),object,coordtemp])
                             else:
-                                ids.append([string.join(coord,", "),object.getId(),object.getId(),object])
+                                ids.append([string.join(coord,", "),object.getId(),object.getId(),object,coordtemp])
                     
             except:
                 """nothing"""