--- ECHO_content/ECHO_collection.py	2004/04/16 16:04:52	1.46
+++ ECHO_content/ECHO_collection.py	2004/04/22 17:35:14	1.49
@@ -28,7 +28,7 @@ from Globals import Persistent, package_
 from Acquisition import Implicit
 
 #from psycopg import libpq
-#from pyPgSQL import libpq
+from pyPgSQL import libpq
 import xml.dom.minidom
 
 import urllib
@@ -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"""
@@ -313,6 +320,11 @@ class ECHO_resource(Folder):
         except:
             return []
 
+    def getContentType(self):
+	    try:
+		    return self.contentType
+	    except:
+		    return ""
 
     def ECHO_resource_config(self):
         """Main configuration"""
@@ -436,6 +448,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 +545,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)
@@ -597,7 +625,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
     
@@ -629,21 +661,21 @@ class ECHO_collection(Folder, Persistent
         return ret
     
     security.declarePublic('ECHO_rerenderLinksMD')
-    def ECHO_rerenderLinksMD(self):
+    def ECHO_rerenderLinksMD(self,obj=None):
         """Rerender all Links"""
-        
-        for entry in self.__dict__.keys():
-            object=getattr(self,entry)
-            
+        if not obj:
+            obj = self
             
-            try:
+        entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_resource','ECHO_collection'])
+
+        for entry in entries:
+		if entry[1].meta_type == 'ECHO_resource':
+			entry[1].ECHO_getResourceMD(template="no")
+			print "rerender",entry[1].getId()
+		else:
+		   self.ECHO_rerenderLinksMD(entry[1])
+
                 
-                if object.meta_type == 'ECHO_resource':
-                    
-                    object.ECHO_getResourceMD(template="no")
-                    
-            except:
-                """nothing"""
                 
         return "Rerenderd all links to resources in: "+self.title
 
@@ -822,14 +854,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"""
@@ -947,6 +979,13 @@ class ECHO_root(Folder,Persistent,Implic
     """ECHO Root Folder"""
     meta_type="ECHO_root"
 
+    
+    def getImageTag(self):
+	    """needed by main_template"""
+	    return ""
+    secondaryLink="" #needed by main_template
+    secondaryLinkTitle="" #needed by main_template
+    
     def getBgcolour(self):
 	"""hack"""
 	return "#dddddd"
@@ -985,7 +1024,7 @@ class ECHO_root(Folder,Persistent,Implic
                     entry[1].patchContentType(entry[1])    
 
                 
-        return "Rerenderd all links to resources in: "+self.title
+        return "changed all contenttypes in: "+self.title
     
     def ECHO_newViewerLink(self,obj=None):
         """change links (:86 faellt weg)"""