--- ECHO_content/ECHO_collection.py	2004/03/30 15:30:58	1.21
+++ ECHO_content/ECHO_collection.py	2004/04/02 15:06:47	1.25
@@ -30,7 +30,7 @@ import xml.dom.minidom
 
 import urllib
 import xml.dom.minidom
-
+from ECHO_graphicalOverview import javaHandler,javaScriptMain
 
 #List of different types for the graphical linking viewer
 viewClassificationListMaster=['view point','area']
@@ -244,7 +244,7 @@ class ECHO_resource(Folder):
         
         
         setECHO_collectionInformation(self,title,label,description,content_type,responsible,credits,weight,coordsnew)
-        
+
         self.coords=coordsnew[0:]
         self.link=link
         self.metalink=metalink
@@ -420,13 +420,56 @@ def manage_addECHO_externalLink(self,id,
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
  
-        
+
+
 class ECHO_collection(Folder, Persistent, Implicit):
     """ECHO Collection"""
     security=ClassSecurityInfo()
     meta_type='ECHO_collection'
 
+    def getImageTag(self):
+        """GetTag"""
+        try:
+            return self.imageTag
+        except:
+            return ""
 
+    def addResource(self,id,title,label,description,content_type,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
+        """SSS"""
+        try:
+            manage_addECHO_resource(self,id,title,label,description,content_type,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None)
+            return "done"
+        except:
+            return None
+    
+    def getCollectionTreeXML(self):
+        """Tree as XML"""
+
+        def getCollection(object,depth=0):
+            depth+=1
+            collections=""
+            for entry in object.__dict__.keys():
+                element=getattr(object,entry)
+                try:
+                    if element.meta_type=="ECHO_collection":
+                        collections+="<element name=\""+element.title+"\" url=\""+element.absolute_url()+"\">"
+                        collections+=getCollection(element,depth)+"</element>\n"
+                except:
+                    """nothing"""
+            return collections
+        
+
+        return "<collection>"+getCollection(self)+"</collection>"
+    
+    def createJavaScript(self):
+        """CreateJava"""
+        ret=javaScriptMain
+
+        dynamical=""
+        for ob in self.getGraphicCoords():
+            dynamical+="""Coords.push(new Coord('%s', Img, %s));\n"""%(ob[1],ob[0])
+        ret+=javaHandler%dynamical
+        return ret
     
     security.declarePublic('getCreditObject')
     def getCreditObject(self,name):
@@ -487,7 +530,7 @@ class ECHO_collection(Folder, Persistent
 
             return []
         
-    def __init__(self,id,title,label,description,content_type,responsible,credits,weight,sortfield,coords):
+    def __init__(self,id,title,label,description,content_type,responsible,credits,weight,sortfield,coords,imageTag=""):
         #print "CO",coords
 
         self.id = id
@@ -498,7 +541,7 @@ class ECHO_collection(Folder, Persistent
         self.description=description
         self.content_type=content_type
         self.responsible=responsible
-
+        self.imageTag=imageTag
         self.weight=weight
         self.sortfield=sortfield
         coordsnew=[ string.split(x,",") for x in coords]
@@ -561,10 +604,10 @@ class ECHO_collection(Folder, Persistent
     security.declarePublic('changeECHO_collection')
 
 
-    def changeECHO_collection(self,title,label,description,content_type,responsible,weight,credits=None,sortfield="weight",coords=None,RESPONSE=None):
+    def changeECHO_collection(self,title,label,description,content_type,responsible,weight,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag=""):
         """Änderung der Properties"""
 
-        
+        self.imageTag=imageTag
         coordsnew=[ string.split(x,",") for x in coords]
 
         setECHO_collectionInformation(self,title,label,description,content_type,responsible,credits,weight,coordsnew)
@@ -577,8 +620,14 @@ class ECHO_collection(Folder, Persistent
             
     security.declarePublic('index_html')
 
-    showOverview=DTMLFile('dtml/ECHO_content_overview',globals())
-    
+
+    def showOverview(self):
+        """overview"""
+        if 'ECHO_overview.html' in self.__dict__.keys():
+            return getattr(self,'ECHO_overview.html')()
+        pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_content_overview.zpt').__of__(self)
+        return pt()
+
     
     def index_html(self):
         """standard page"""
@@ -600,6 +649,8 @@ class ECHO_collection(Folder, Persistent
         else:
             return []
 
+
+        
     def getGraphicCoords(self):
         """Give list of coordinates"""
         subColTypes=['ECHO_collection','ECHO_externalLink','ECHO_resource']
@@ -611,13 +662,15 @@ class ECHO_collection(Folder, Persistent
                     for coordtemp in object.coords:
                         if len(coordtemp)>3:
                             coord=coordtemp[0:4]
-                            if hasattr(object,'title'):
+                            if hasattr(object,'label') and not object.label=="":
+                                ids.append([string.join(coord,", "),object.getId(),object.label,object])
+                            elif hasattr(object,'title'):
                                 if not object.title=="":
-                                    ids.append([string.join(coord,", "),object.getId(),object.title])
+                                    ids.append([string.join(coord,", "),object.getId(),object.title,object])
                                 else:
-                                    ids.append([string.join(coord,", "),object.getId(),object.getId()])
+                                    ids.append([string.join(coord,", "),object.getId(),object.getId(),object])
                             else:
-                                ids.append([string.join(coord,", "),object.getId(),object.getId()])
+                                ids.append([string.join(coord,", "),object.getId(),object.getId(),object])
                     
             except:
                 """nothing"""
@@ -666,11 +719,11 @@ def manage_addECHO_collectionForm(self):
         return pt()
 
 
-def manage_addECHO_collection(self,id,title,label,description,content_type,responsible,weight,sortfield,coords="",credits=None,RESPONSE=None):
+def manage_addECHO_collection(self,id,title,label,description,content_type,responsible,weight,sortfield,coords="",credits=None,RESPONSE=None,imageTag=""):
     """add a echo collection"""
     
 
-    newObj=ECHO_collection(id,title,label,description,content_type,responsible,credits,weight,sortfield,coords)
+    newObj=ECHO_collection(id,title,label,description,content_type,responsible,credits,weight,sortfield,coords,imageTag)
 
     self._setObject(id,newObj)
 
@@ -681,6 +734,8 @@ class ECHO_root(Folder,Persistent,Implic
     """ECHO Root Folder"""
     meta_type="ECHO_root"
 
+    
+
     def ECHO_newViewerLink(self,obj=None):
         """change links (:86 faellt weg)"""
 
@@ -789,6 +844,9 @@ class ECHO_root(Folder,Persistent,Implic
             ids=[] # no partners
         return ids
 
+    
+    
+       
     def getCollectionTree(self):
         """get the collection tree (list of triples (parent,child, depth)"""