--- ECHO_content/ECHO_collection.py	2005/03/07 21:25:09	1.218
+++ ECHO_content/ECHO_collection.py	2005/06/08 07:07:27	1.223
@@ -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.
 
@@ -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
@@ -1368,6 +1369,7 @@ class ECHO_externalLink(Folder,ECHO_basi
             
     manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_externalLink_config'},
+	{'label':'Graphic Coords','action':'ECHO_graphicEntry'},
         )
 
         
@@ -1530,7 +1532,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 +1547,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 +1556,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)
@@ -1776,20 +1793,22 @@ class ECHO_collection(Folder, Persistent
             return ""
 
 
-    def addMovie(self,id,title,label,description,contentType,responsible,link,thumbUrl,rawFile,metalink,weight,credits=None,coords=None,RESPONSE=None):
+    def addMovie(self,id,title,label,description,contentType,responsible,link,thumbUrl,rawFile,lowresFile,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)
+			manage_addECHO_movie(self,id,title,label,description,responsible,link,thumbUrl,rawFile,lowresFile,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)
-	    
+		obj.changeECHO_movie_main(metalink,link,rawFile,lowresFile,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:
@@ -2050,7 +2069,7 @@ class ECHO_collection(Folder, Persistent
 
     def getAllMapAreas(self):
         """Give list of coordinates"""
-        mapColTypes=['ECHO_collection','ECHO_resource']
+        mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink']
         areas=[]
         for entry in self.getSubCols(subColTypes=mapColTypes):
             object=entry