--- ECHO_content/ECHO_collection.py	2005/02/28 14:09:55	1.215
+++ ECHO_content/ECHO_collection.py	2005/03/07 20:05:38	1.217
@@ -1,3 +1,4 @@
+
 """New version of the product started February, 8th. Without scientific classification, use content-type for further classification."""
 """Echo collection provides the classes for the ECHO content web-site.
 
@@ -64,7 +65,7 @@ import xml.dom.minidom
 import ECHO_helpers
 from ECHO_helpers import *
 from ECHO_language import *
-
+from ECHO_movie import *
 
 #regexp for extracting elements from xml
 patternTXT=r"<\s*txt.*?>(.*?)</txt>"
@@ -1411,7 +1412,7 @@ def manage_addECHO_linkForm(self):
         return pt()
 
 
-def manage_addECHO_link(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None):
+def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,RESPONSE=None):
     """Add an external Link"""
 
     newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)
@@ -1774,6 +1775,20 @@ class ECHO_collection(Folder, Persistent
         except:
             return ""
 
+
+    def addMovie(self,id,title,label,description,contentType,responsible,link,thumbUrl,rawFile,metalink,weight,credits=None,coords=None,RESPONSE=None):
+        """SSS"""
+	print "we are here"
+	if hasattr(self,id):
+		try:
+			manage_addECHO_movie(self,id,title,label,description,responsible,link,thumbUrl,rawFile,metalink,weight,credits=None,coords=None,RESPONSE=None)
+			return "done"
+		except:
+			return None
+	else:
+		obj=getattr(self,id)
+		obj.changeECHO_movie_main(metalink,link,rawFile,thumbUrl,title,label,description,contentType,weight=weight)
+	    
     def addResource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
         """SSS"""
         try:
@@ -1870,7 +1885,7 @@ class ECHO_collection(Folder, Persistent
 	return ECHO_rerenderLinksMD(self,obj,types)
 
 	
-    def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag="",bgcolour=""):
+    def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour=""):
 
         self.id = id
         """Festlegen der ID"""
@@ -2629,6 +2644,7 @@ class ECHO_root(Folder,Persistent,Implic
 	"""hack"""
 	return "#dddddd"
 
+    security.declareProtected('View','contentTypeSelector_HTML')
     def contentTypeSelector_HTML(self,selected=None):
         """give type selector"""
         if not selected:
@@ -2981,7 +2997,8 @@ class ECHO_root(Folder,Persistent,Implic
         """Quote string"""
 
         return libpq.PgQuoteString(string)
-        
+
+    security.declareProtected('View','getPartners')
     def getPartners(self):
         """Get list of Partners. Presently only from a subfolder partners"""
 	if hasattr(self,'partners'):