--- ECHO_content/ECHO_collection.py	2005/02/28 20:02:08	1.216
+++ ECHO_content/ECHO_collection.py	2005/03/22 16:41:36	1.221
@@ -1,4 +1,3 @@
-
 """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.
 
@@ -65,7 +64,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>"
@@ -1201,7 +1200,9 @@ class ECHO_resource(Folder,Persistent,EC
         if not error=="": #Fehler beim Auslesen des Metafiles
 		return "ERROR:",error
 	
-
+	if not self.contentType:
+		self.contentType=metadict['bib_type'].lower()
+		
 	if not (metadict['bib_type'].lower()==self.contentType.lower()):
 		self.REQUEST.SESSION['contentStorage']=metadict['bib_type']
 		self.REQUEST.SESSION['contentZope']=self.contentType
@@ -1530,7 +1531,7 @@ class ECHO_collection(Folder, Persistent
 	    ret=""
 	    argv=self.REQUEST.form
 	    
-	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
+	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_movie','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
 	    for resource in resources:
 		   
 		    try:
@@ -1545,7 +1546,7 @@ class ECHO_collection(Folder, Persistent
 	    ret=""
 	    argv=self.REQUEST.form
 	    
-	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_movie','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
 	    for resource in resources:
 		   
 		    try:
@@ -1554,7 +1555,22 @@ class ECHO_collection(Folder, Persistent
 		    except:
 			    pass
 	    return ret
-        
+    
+    def changeLabelsInCollection(self):
+	    """change all lables of a collection"""
+	    ret=""
+	    argv=self.REQUEST.form
+	    
+	    resources=self.ZopeFind(self,obj_metatypes=['ECHO_pageTemplate','ECHO_movie','ECHO_resource','ECHO_collection','ECHO_link','ECHO_externalLink'])
+	    for resource in resources:
+		   
+		    try:
+			    ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
+                            resource[1].label=argv[resource[1].getId()][0:]
+		    except:
+			    pass
+	    return ret
+       
     def updateCollection(self,RESPONSE=None):
         """liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
         files=os.listdir(self.path)
@@ -1775,6 +1791,23 @@ 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"
+	#manage_addECHO_movie(self,id,title,label,description,responsible,link,thumbUrl,rawFile,metalink,weight,credits=None,coords=None,RESPONSE=None)
+	if not 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)
+
+	return "changed"
+
     def addResource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
         """SSS"""
         try:
@@ -2630,6 +2663,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:
@@ -2982,7 +3016,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'):