--- ECHO_content/ECHO_collection.py	2004/04/02 07:56:26	1.24
+++ ECHO_content/ECHO_collection.py	2004/04/04 17:48:22	1.28
@@ -96,7 +96,7 @@ def readMetadata(url):
     return metadict,""
     
 
-def setECHO_collectionInformation(self,title,label,description,content_type,responsible,credits,weight,coordstrs,viewClassification=""):
+def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs,viewClassification=""):
 
         """Allegemeine Informationen zu einer ECHO Collection"""
 
@@ -105,7 +105,7 @@ def setECHO_collectionInformation(self,t
         self.label = label
         self.title=title
         self.description=description
-        self.content_type=content_type
+        self.contentType=contentType
         self.responsible=responsible
         self.credits=toList(credits)
         self.weight=weight
@@ -193,7 +193,7 @@ class ECHO_resource(Folder):
         else:
             return []
     
-    def __init__(self,id,link,metalink,title,label,description,content_type,responsible,credits,weight,coords):
+    def __init__(self,id,link,metalink,title,label,description,contentType,responsible,credits,weight,coords):
 
         self.id = id
         """Festlegen der ID"""
@@ -205,7 +205,7 @@ class ECHO_resource(Folder):
         self.weight=weight
         self.credits=toList(credits)
         self.description=description
-        self.content_type=content_type
+        self.contentType=contentType
         self.responsible=responsible
         
         if coords:
@@ -236,14 +236,14 @@ class ECHO_resource(Folder):
         return pt()
     
 
-    def changeECHO_resource(self,metalink,link,title,label,description,content_type,responsible,weight,viewClassification="",coords=None,credits=None,RESPONSE=None):
+    def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,viewClassification="",coords=None,credits=None,RESPONSE=None):
         """Änderung der Properties"""
         
         
         coordsnew=[ string.split(x,",") for x in coords]
         
         
-        setECHO_collectionInformation(self,title,label,description,content_type,responsible,credits,weight,coordsnew)
+        setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)
 
         self.coords=coordsnew[0:]
         self.link=link
@@ -328,10 +328,10 @@ def manage_addECHO_resourceForm(self):
 
 
 
-def manage_addECHO_resource(self,id,title,label,description,content_type,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
+def manage_addECHO_resource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
     """addaresource"""
 
-    newObj=ECHO_resource(id,link,metalink,title,label,description,content_type,responsible,credits,weight,coords)
+    newObj=ECHO_resource(id,link,metalink,title,label,description,contentType,responsible,credits,weight,coords)
 
     self._setObject(id,newObj)
 
@@ -345,7 +345,7 @@ class ECHO_externalLink(Folder):
     meta_type='ECHO_externalLink'
 
 
-    def __init__(self,id,link,title,label,description,content_type,responsible,credits,weight,coords):
+    def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
 
         self.id = id
         """Festlegen der ID"""
@@ -356,7 +356,7 @@ class ECHO_externalLink(Folder):
         self.title=title
         self.weight=weight
         self.description=description
-        self.content_type=content_type
+        self.contentType=contentType
         self.responsible=responsible
         coordsnew=[ string.split(x,",") for x in coords]
         self.coords=coordsnew
@@ -375,12 +375,12 @@ class ECHO_externalLink(Folder):
         return pt()
     
 
-    def changeECHO_externalLink(self,link,title,label,description,content_type,responsible,weight,coords=None,credits=None,RESPONSE=None):
+    def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
 
         """Änderung der Properties"""
         coordsnew=[ string.split(x,",") for x in coords]
 
-        setECHO_collectionInformation(self,title,label,description,content_type,responsible,credits,weight,coords)
+        setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coords)
 
         self.coords=coordsnew[0:]
         self.link=link
@@ -410,10 +410,10 @@ def manage_addECHO_externalLinkForm(self
         return pt()
 
 
-def manage_addECHO_externalLink(self,id,title,label,description,content_type,responsible,link,weight,coords=None,credits=None,RESPONSE=None):
+def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None):
     """Add an external Link"""
 
-    newObj=ECHO_externalLink(id,link,title,label,description,content_type,responsible,credits,weight,coords)
+    newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords)
 
     self._setObject(id,newObj)
 
@@ -427,10 +427,17 @@ class ECHO_collection(Folder, Persistent
     security=ClassSecurityInfo()
     meta_type='ECHO_collection'
 
-    def addResource(self,id,title,label,description,content_type,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
+    def getImageTag(self):
+        """GetTag"""
+        try:
+            return self.imageTag
+        except:
+            return ""
+
+    def addResource(self,id,title,label,description,contentType,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)
+            manage_addECHO_resource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None)
             return "done"
         except:
             return None
@@ -523,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,contentType,responsible,credits,weight,sortfield,coords,imageTag=""):
         #print "CO",coords
 
         self.id = id
@@ -532,9 +539,9 @@ class ECHO_collection(Folder, Persistent
         self.label = label
         self.title=title
         self.description=description
-        self.content_type=content_type
+        self.contentType=contentType
         self.responsible=responsible
-
+        self.imageTag=imageTag
         self.weight=weight
         self.sortfield=sortfield
         coordsnew=[ string.split(x,",") for x in coords]
@@ -597,13 +604,13 @@ 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,contentType,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)
+        setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)
         
         self.coords=coordsnew[0:]
         self.sortfield=sortfield
@@ -632,7 +639,7 @@ class ECHO_collection(Folder, Persistent
             
         
         pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_content_standard.zpt').__of__(self)
-        pt.content_type="text/html"
+        pt.contentType="text/html"
         return pt()
 
     def getCredits(self):
@@ -712,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,contentType,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,contentType,responsible,credits,weight,sortfield,coords,imageTag)
 
     self._setObject(id,newObj)
 
@@ -727,8 +734,43 @@ class ECHO_root(Folder,Persistent,Implic
     """ECHO Root Folder"""
     meta_type="ECHO_root"
 
+
+    def contentTypeSelector_HTML(self,selected=None):
+        """give type selector"""
+        if not selected:
+            retStr="<option selected>\n"
+        else:
+            retStr="<option>\n"
+            
+        try:
+            for contentType in self.ZopeFind(self.contentTypes,obj_metatypes="ECHO_contentType"):
+                if selected and (contentType[0]==selected):
+                    retStr+="""<option selected value="%s">%s\n"""%(contentType[0],contentType[0])
+                else:                
+                    retStr+="""<option value="%s">%s\n"""%(contentType[0],contentType[0])
+        except:
+            """nothing"""
+        return retStr
+            
+    def patchContentType(self,obj=None):
+        """austauschen content_type with contentType (patch bei umstieg von alter Version)"""
     
 
+        if not obj:
+            obj = self
+            
+        entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_resource','ECHO_collection,ECHO_externalLink,ECHO_pageTemplate'])
+
+        for entry in entries:
+                
+                entry[1].contentType == entry[1].content_type
+
+                if entry[1].meta_type == 'ECHO_collection':
+                    entry[1].patchContentType(entry[1])    
+
+                
+        return "Rerenderd all links to resources in: "+self.title
+    
     def ECHO_newViewerLink(self,obj=None):
         """change links (:86 faellt weg)"""
 
@@ -820,26 +862,22 @@ class ECHO_root(Folder,Persistent,Implic
         
     def getPartners(self):
         """Get list of Partners. Presently only from a subfolder partners"""
-        partnerTypes=['ECHO_partner']
-        ids=[]
-        try:
-            for entry in self.partners.__dict__.keys():
-                object=getattr(self.partners,entry)
+                    
+        return [ item[1] for item in self.partners.ZopeFind(self.partners,obj_metatypes=['ECHO_partner'])]
                 
-                try:
                 
-                    if object.meta_type in partnerTypes:
-                        ids.append(object)
-                    
-                except:
-                    """nothing"""
-        except:
-            ids=[] # no partners
-        return ids
+                   
 
     
+    def getPartnersXML(self):
+        """partner liste als xml""" 
+        partners=self.getPartners()
+        ret="<partners>"
+        for partner in partners:
+            ret+="""<partner id="%s" title="%s"/>\n"""%(partner.getId(),partner.title)
+
+        return ret+"\n</partners>"
     
-       
     def getCollectionTree(self):
         """get the collection tree (list of triples (parent,child, depth)"""
 
@@ -885,15 +923,15 @@ class ECHO_partner(Image,Persistent):
 
     meta_type="ECHO_partner"
 
-    def __init__(self, id, title,url, file, content_type='', precondition=''):
+    def __init__(self, id, title,url, file, contentType='', precondition=''):
         self.__name__=id
         self.title=title
         self.url=url
         self.precondition=precondition
 
         data, size = self._read_data(file)
-        content_type=self._get_content_type(file, data, id, content_type)
-        self.update_data(data, content_type, size)
+        contentType=self._get_contentType(file, data, id, contentType)
+        self.update_data(data, contentType, size)
 
     manage_options = Image.manage_options+(
         {'label':'Partner Information','action':'ECHO_partner_config'},
@@ -920,7 +958,7 @@ manage_addECHO_partnerForm=DTMLFile('dtm
 
 
 
-def manage_addECHO_partner(self, id, file,url, title='', precondition='', content_type='',
+def manage_addECHO_partner(self, id, file,url, title='', precondition='', contentType='',
                     REQUEST=None):
     """
     Add a new ECHO_partner object.
@@ -931,7 +969,7 @@ def manage_addECHO_partner(self, id, fil
 
     id=str(id)
     title=str(title)
-    content_type=str(content_type)
+    contentType=str(contentType)
     precondition=str(precondition)
 
     id, title = OFS.Image.cookId(id, title, file)
@@ -939,14 +977,14 @@ def manage_addECHO_partner(self, id, fil
     self=self.this()
 
     # First, we create the image without data:
-    self._setObject(id, ECHO_partner(id,title,url,'',content_type, precondition))
+    self._setObject(id, ECHO_partner(id,title,url,'',contentType, precondition))
 
     # Now we "upload" the data.  By doing this in two steps, we
     # can use a database trick to make the upload more efficient.
     if file:
         self._getOb(id).manage_upload(file)
-    if content_type:
-        self._getOb(id).content_type=content_type
+    if contentType:
+        self._getOb(id).contentType=contentType
 
     if REQUEST is not None:
         try:    url=self.DestinationURL()