--- ECHO_content/ECHO_collection.py	2004/06/07 08:50:14	1.98
+++ ECHO_content/ECHO_collection.py	2004/06/08 12:51:01	1.107
@@ -46,14 +46,14 @@ import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain
 import ECHO_helpers
 
-def getCopyrightsFromForm(argv):
+def getCopyrightsFromForm(self,argv):
 	medias={}
 	partners={}
 	copyrights={}
 	
 	copyrightsFinal=[]
 	for arg in argv.keys():
-		print arg
+		
 		if arg[0:5]=='media':
 			nm=int(arg[5:])
 			medias[nm]=argv[arg]
@@ -64,10 +64,18 @@ def getCopyrightsFromForm(argv):
 			nm=int(arg[5:])
 			copyrights[nm]=argv[arg]
 
+
+
 	copyrightsList=[(medias[nm],partners[nm],copyrights[nm]) for nm in medias.keys()]
 	for copyright in copyrightsList:
-		if not copyright[0]=='':
-			copyrightsFinal.append(copyright)
+		
+		if copyright[2]=='institution0000':
+			copyrightsFinal.append((copyright[0],copyright[1],self.getPartnerCopyright(copyright[1],'')))
+		else:
+			if not copyright[0]=='':
+				copyrightsFinal.append(copyright)
+		
+			
 	return copyrightsFinal
 
 #List of different types for the graphical linking viewer
@@ -338,7 +346,7 @@ class ECHO_copyright(Folder):
 		"""change"""
 		self.title=title
 		self.copyrights=[]
-		self.copyrights=getCopyrightsFromForm(self.REQUEST.form)[0:]
+		self.copyrights=getCopyrightsFromForm(self,self.REQUEST.form)[0:]
 
 		if RESPONSE is not None:
 			RESPONSE.redirect('manage_main')
@@ -358,7 +366,7 @@ def manage_addECHO_copyright(self, id,ti
 	
 		
 
-	self._setObject(id, ECHO_copyright(id, title,getCopyrightsFromForm(self.REQUEST.form)))
+	self._setObject(id, ECHO_copyright(id, title,getCopyrightsFromForm(self,self.REQUEST.form)))
 
 	if RESPONSE is not None:
 		RESPONSE.redirect('manage_main')
@@ -479,17 +487,27 @@ class ECHO_resource(Folder,Persistent):
 		    else:
 			    return "<error>no fulltext available</error>"
 
-    def getCopyright(self):
+    def getCopyrightsHTML(self):
 	    """gib link auf copyright notiz aus"""
-	    if hasattr(self,'copyrightType') and hasattr(self.copyrightTypes,self.copyrightType):
-		    obj=getattr(self.copyrightTypes,self.copyrightType)
+	    
+	    if hasattr(self,'copyrightModell'):
+		    obj=self.copyrightModell
+		    
 	    else:
-		    obj=getattr(self.copyrightTypes,'generic')
-
-	    label=obj.label
-	    link="copyrightTypes/"+obj.getId()+'/copyright.html'
+		    return "ERROR"
+	    ret=[]
 	    
-	    return """<a target="_blank" href="%s">%s</a>"""%(link,label)
+	    for copyright in obj.getCopyrights():
+		    
+		    link="copyrightTypes/"+copyright[2]+'/copyright.html'
+		    
+		    try:
+			    label=getattr(self.copyrightTypes,copyright[2]).label
+			    ret.append(("""<a target="_blank" href="%s">%s</a>"""%(link,label),copyright[0],copyright[0],copyright[1],copyright[2]))
+		    except:
+			    """nothing"""
+		    
+	    return ret
     
     def getCredits(self):
         """Ausgabe der credits"""
@@ -1480,7 +1498,7 @@ class ECHO_collection(Folder, Persistent
 	    else:
 		    return "#dddddd"
 	    
-    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",viewClassification=None):
+    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",viewClassification=None,location=None):
         """Aenderung der Properties"""
 
         self.secondaryLink=secondaryLink
@@ -1488,6 +1506,7 @@ class ECHO_collection(Folder, Persistent
         self.imageTag=imageTag
 	self.bgcolour=bgcolour
         self.viewClassification=viewClassification
+        self.location=location
 	
         if coords:
             coordsnew=[ string.split(x,",") for x in coords]
@@ -1935,12 +1954,19 @@ class ECHO_root(Folder,Persistent,Implic
 	 return retStr
 
 
-    def copyrightTypeSelector_HTML(self,selected=None):
+    def copyrightTypeSelector_HTML(self,selected=None,first=None):
          """give type selector"""
-	 if not selected:
-		 retStr="<option selected>\n"
+
+	 if not first:
+		 if not selected:
+			 retStr="<option selected>\n"
+		 else:
+			 retStr="<option>\n"
 	 else:
-		 retStr="<option>\n"
+		 if not selected:
+			 retStr="""<option selected value="%s">%s\n"""%first
+		 else:
+			 retStr="""<option value="%s">%s\n"""%first
 
 	 
 	 try: # erste version copyrightTypes exists
@@ -2249,6 +2275,11 @@ class ECHO_root(Folder,Persistent,Implic
 	    
 	    self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
 	    self.REQUEST.RESPONSE.write(ret)
+	    
+    def findPartners(self):	
+        """find all partners in partners"""
+        par=self.ZopeFind(self.partners, obj_metatypes='ECHO_partner')
+        return par
         
 def manage_addECHO_root(self,id,title,RESPONSE=None):
     """Add an ECHO_root"""
@@ -2314,12 +2345,15 @@ class ECHO_partner(Image,Persistent):
 
     meta_type="ECHO_partner"
 
-    def __init__(self, id, title,url, file, copyrightType,content_type='', precondition=''):
+    def __init__(self, id, title,url, file, copyrightType, person, email, country, content_type='', precondition=''):
         self.__name__=id
         self.title=title
         self.url=url
+        self.person=person
+        self.email=email
+        self.country=country
         self.precondition=precondition
-	self.copyrightType=copyrightType
+        self.copyrightType=copyrightType
         data, size = self._read_data(file)
         content_type=self._get_content_type(file, data, id, content_type)
         self.update_data(data, content_type, size)
@@ -2329,10 +2363,13 @@ class ECHO_partner(Image,Persistent):
         )
 
     
-    def changeECHO_partner(self,url,copyrightType,RESPONSE=None):
+    def changeECHO_partner(self,url,copyrightType,person, email, country, RESPONSE=None):
         """Change main information"""
         self.url=url
-	self.copyrightType=copyrightType
+        self.person=person
+        self.email=email
+        self.country=country
+        self.copyrightType=copyrightType
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
             
@@ -2351,7 +2388,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, person, email, country, copyrightType='', title='', precondition='', content_type='',
                     REQUEST=None):
     """
     Add a new ECHO_partner object.
@@ -2370,7 +2407,7 @@ 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,'',copyrightType, person, email, country, content_type, precondition))
 
     # Now we "upload" the data.  By doing this in two steps, we
     # can use a database trick to make the upload more efficient.