--- ECHO_content/ECHO_collection.py	2005/03/17 19:27:34	1.220
+++ ECHO_content/ECHO_collection.py	2005/06/20 13:04:25	1.225
@@ -39,6 +39,7 @@ from Globals import Persistent, package_
 from Acquisition import Implicit
 
 import urllib
+import cgi
 import smtplib
 import time
 from Ft.Xml.Domlette import NonvalidatingReader
@@ -262,9 +263,6 @@ class ECHO_resource(Folder,Persistent,EC
 
     getSubCols = ECHO_helpers.getSubCols
 
-    security.declareProtected('View','index_html')
-
-    
   
     security.declareProtected('View','createPDF')
     def createPDF(self,RESPONSE=None,local=None,dpi=150):
@@ -1200,7 +1198,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
@@ -1238,6 +1238,7 @@ class ECHO_resource(Folder,Persistent,EC
 		    return None
 	    
 	    
+    security.declareProtected('View','index_html')
     def index_html(self):
         """standard page"""
         pdf=self.checkRDF(self.link)
@@ -1306,7 +1307,7 @@ def manage_addECHO_resourceForm(self):
 
 
 def manage_addECHO_resource(self,id,title,label,description="",responsible="",link="",metalink="",weight="",copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
-    """addaresource"""
+    """addresource"""
 
     newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords)
 
@@ -1367,6 +1368,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'},
         )
 
         
@@ -1404,7 +1406,27 @@ class ECHO_link(ECHO_externalLink):
 			return ECHO_basis.content_html(self,'link')
 		else:
 			return ECHO_basis.content_html(self,'collection')
-	
+
+	def index_html(self):
+		"""standard link"""
+
+		splitted=self.link.split("?")
+		if len(splitted)>1:
+			params=cgi.parse_qs(splitted[1])
+
+			for x in params.keys():
+				if type(params[x]) is ListType:
+					params[x]=params[x][0]
+        
+
+		else:
+			params={}
+		
+		params['backLink']=self.aq_parent.absolute_url()
+
+		
+		return self.REQUEST.RESPONSE.redirect(splitted[0]+"?"+urllib.urlencode(params))
+
 def manage_addECHO_linkForm(self):
         """Form for external Links"""
         pt=zptFile(self, 'zpt/AddECHO_linkForm.zpt')
@@ -1790,19 +1812,19 @@ 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"
 
@@ -1994,8 +2016,8 @@ class ECHO_collection(Folder, Persistent
         pt=zptFile(self, 'zpt/ECHO_content_overview.zpt')
         return pt()
 
+
     security.declareProtected('View','index_html')
-    
     def index_html(self):
         """standard page"""
         if self.ZCacheable_isCachingEnabled():
@@ -2066,7 +2088,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
@@ -2404,6 +2426,11 @@ class ECHO_root(Folder,Persistent,Implic
 	pt = zptObjectOrFile(self, 'content_overview_template')
 	return pt
 
+    def mapstyle_css(self):
+        """send mapstyle.css"""
+        sendFile(self, 'html/ECHO_mapstyle.css', 'text/css')
+
+
     ###Cdli adds -> have to be removed
     def getTablet(self,item):
         #print "getTablet"
@@ -2689,23 +2716,6 @@ class ECHO_root(Folder,Persistent,Implic
 
     def renderingTypeSelector_HTML(self,selected=None):
          """give type selector"""
-	 if not selected:
-		 retStr="<option selected>\n"
-	 else:
-		 retStr="<option>\n"
-		 
-	 try: # erste version renderingTypes exists
-		 for renderingType in self.ZopeFind(self.renderingTypes,obj_metatypes=["ECHO_renderingType"]):
-			 if selected and (renderingType[0]==selected):
-				 retStr+="""<option selected value="%s">%s\n"""%(renderingType[0],renderingType[0])
-			 else:                
-				 retStr+="""<option value="%s">%s\n"""%(renderingType[0],renderingType[0])
-	 except:
-		 """nothing"""
-	 return retStr
-
-    def renderingTypeSelector_HTML(self,selected=None):
-         """give type selector"""
 	 if not selected:
 		 retStr="<option selected>\n"
 	 else: