--- ECHO_content/ECHO_collection.py	2004/05/26 07:39:36	1.90
+++ ECHO_content/ECHO_collection.py	2004/06/18 10:17:58	1.118
@@ -46,9 +46,42 @@ import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain
 import ECHO_helpers
 
+def getCopyrightsFromForm(self,argv):
+	medias={}
+	partners={}
+	copyrights={}
+	
+	copyrightsFinal=[]
+	for arg in argv.keys():
+		
+		if arg[0:5]=='media':
+			nm=int(arg[5:])
+			medias[nm]=argv[arg]
+		elif arg[0:5]=='partn':
+			nm=int(arg[5:])
+			partners[nm]=argv[arg]
+		elif arg[0:5]=='copyr':
+			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 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
 viewClassificationListMaster=['view point','area']
 
+
 def checkDiffs(self,metadict):
 	    """check differences"""
 
@@ -75,11 +108,11 @@ def checkDiffs(self,metadict):
 			    if (NoneToEmpty(self.getFieldValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]):
 				    diffs[self.getFieldTag(tags,field)]=1
 			    else:
-				    #print "DIFF",field,self.getFieldValue(self.getFieldTag(tags,field)),metadict[self.getFieldTag(tags,field)]
+				    
 				    diffs[self.getFieldTag(tags,field)]=0
 		    except:
 			    diffs[self.getFieldTag(tags,field)]=0
-			    #print "EX",field
+			    
 	    return diffs
     
 def content_html(self,type):
@@ -88,11 +121,11 @@ def content_html(self,type):
         #
         #if templates:
         #    return templates[0][1]()
-
-        try:
+	
+        if hasattr(self,type+"_template"):
             obj=getattr(self,type+"_template")
             return obj()
-        except:
+        else:
             pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_%s_template_standard.zpt'%type).__of__(self)
             pt.content_type="text/html"
             return pt()
@@ -231,7 +264,7 @@ def readMetadata(url):
     if len(metanode)==0:
         metanode=dom.getElementsByTagName('archimedes')
         metadict['bib_type']='Archimedes'
-        #print "HELLO"
+        
         
     if not len(metanode)==0:    
         metacontent=metanode[0].childNodes
@@ -243,7 +276,8 @@ def readMetadata(url):
         
         for node in metacontent:
             try:
-                metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
+		    #print urllib.unquote(getText(node.childNodes)),getText(node.childNodes)
+		    metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
             except:
                 """nothing"""
 
@@ -268,66 +302,75 @@ def setECHO_collectionInformation(self,t
         coords=[]
         #coordinates of for rectangles
 
-        #print "cs", coordstrs
+        
         if coordstrs:
             for coordstr in coordstrs:
-                #print "cs", coordstr
+        
                 try:
                     temco=coordstr.split(",")
                 except:
                     temco=[]
-                #temco.append(angle)
+        
                 coords.append(temco)
 
 
         self.coords=coords[0:]
             
+class ECHO_copyright(Folder):
+	"""Copyright informationen"""
+	meta_type="ECHO_copyright"
+	
+	
+	
+	def __init__(self,id,title,copyrights):
+		"""init"""
+		self.title=title
+		self.id=id
+		self.copyrights=copyrights[0:]
+
+	def getCopyrights(self):
+		"""return coyprights"""
+		return self.copyrights
+	        
+	manage_options = Folder.manage_options+(
+		{'label':'Main Config','action':'ECHO_copyright_configForm'},
+		)
 
-class scientificClassification(SimpleItem,Persistent,Implicit):
-    """outdated will be deleeted in the next versions: subclass"""
-    security=ClassSecurityInfo()
-    
-    def __init__(self,context,science,practice):
-        self.context=context
-        self.science=science
-        self.practice=practice
-        self.id="scientific_Classification"
-        
-    security.declarePublic('get_context')
-    def get_context(self):
-        return self.context
-    
-    security.declarePublic('get_science')
-    def get_science(self):
-        return self.science
-        
-    security.declarePublic('get_practice')
-    def get_practice(self):
-        return self.practice
-    
-                
-class scientificInformation(Folder,Persistent,Implicit):
-    """outdated will be deleted in the next versions: subclass scientificInformation"""
-    security=ClassSecurityInfo()
-    
-    
-    
-    def __init__(self,source_type,period):
+	def ECHO_copyright_configForm(self):
+		"""change form"""
+		pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_copyright').__of__(self)
+		pt.content_type="text/html"
+		return pt()
 
-        self.id="scientific_Information"
-        self.source_type=source_type
-        self.period=period
-        
+	def ECHO_copyright_config(self,title,RESPONSE=None):
+		"""change"""
+		self.title=title
+		self.copyrights=[]
+		self.copyrights=getCopyrightsFromForm(self,self.REQUEST.form)[0:]
 
+		if RESPONSE is not None:
+			RESPONSE.redirect('manage_main')
 
-    security.declarePublic('get_source_type')
-    def get_source_type(self):
-        return self.source_type
-    
-    security.declarePublic('get_period')
-    def get_period(self):
-        return self.period
+		
+def manage_addECHO_copyrightForm(self):
+    """Form for adding"""
+    pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_copyright.zpt').__of__(self)
+    return pt()
+
+def manage_addECHO_copyright(self, id,title,RESPONSE=None):
+	"""add the copyright"""
+
+	meta_type="ECHO_copyright"
+	
+	#first generate copyrights as list of tripels (mediaType,partner,copyrightType)
+	
+		
+
+	self._setObject(id, ECHO_copyright(id, title,getCopyrightsFromForm(self,self.REQUEST.form)))
 
+	if RESPONSE is not None:
+		RESPONSE.redirect('manage_main')
+	
 class ECHO_layoutTemplate(ZopePageTemplate):
     """Create a layout Template for different purposes"""
 
@@ -403,6 +446,8 @@ class ECHO_resource(Folder,Persistent):
     viewClassificationList=viewClassificationListMaster
 
     getSubCols = ECHO_helpers.getSubCols
+
+    
     def getTitle(self):
 	"""title"""
 	return self.title.encode('utf-8') 
@@ -441,6 +486,28 @@ class ECHO_resource(Folder,Persistent):
 			    self.REQUEST.RESPONSE.write("<error>no fulltext available</error>")
 		    else:
 			    return "<error>no fulltext available</error>"
+
+    def getCopyrightsHTML(self):
+	    """gib link auf copyright notiz aus"""
+	    
+	    if hasattr(self,'copyrightModell'):
+		    obj=self.copyrightModell
+		    
+	    else:
+		    return "ERROR"
+	    ret=[]
+	    
+	    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?partner=%s">%s</a>"""%(link,copyright[1],label),copyright[0],copyright[1],copyright[2],label))
+		    except:
+			    """nothing"""
+		    
+	    return ret
     
     def getCredits(self):
         """Ausgabe der credits"""
@@ -449,7 +516,7 @@ class ECHO_resource(Folder,Persistent):
         else:
             return []
     
-    def __init__(self,id,link,metalink,resourceID,title,label,description,contentType,renderingType,responsible,credits,weight,coords):
+    def __init__(self,id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords):
 
         self.id = id
         """Festlegen der ID"""
@@ -462,6 +529,7 @@ class ECHO_resource(Folder,Persistent):
         self.credits=toList(credits)
         self.description=description
         self.contentType=contentType
+	self.copyrightType=copyrightType
 	self.renderingType=renderingType
         self.responsible=responsible
         self.resourceID=resourceID
@@ -543,8 +611,7 @@ class ECHO_resource(Folder,Persistent):
 		for data in self.metadata:
 			data_neu=re.sub('-','_',data)
 			self.metaDataHash[data_neu]=getattr(self,data)
-			#print data_neu, getattr(self,data)
-		#print self.metaDataHash,self.metadata
+
 	
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self)
         return pt()
@@ -659,7 +726,6 @@ class ECHO_resource(Folder,Persistent):
             
     manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_resource_config_main'},
-	{'label':'Change Credits & Copyright','action':'ECHO_resource_config_credits'},
 	{'label':'Change Metadata','action':'ECHO_resource_config_metadata'},
 	{'label':'Change Coords','action':'ECHO_resource_config_coords'},
 	{'label':'Add coords','action':'ECHO_graphicEntry'},
@@ -729,7 +795,7 @@ class ECHO_resource(Folder,Persistent):
         
     def getFieldValue(self,field):
         """get value"""
-	#print field
+	
         try:
 	
             ret=self.metaDataHash[field]
@@ -746,7 +812,7 @@ class ECHO_resource(Folder,Persistent):
     
     def setFieldValue(self,field,value):
         """get value"""
-	#print field
+	
 	if not hasattr(self,'metaDataHash'):
 		setattr(self,'metaDataHash',{})
 	self.metaDataHash[field]=value[0:]
@@ -769,9 +835,9 @@ class ECHO_resource(Folder,Persistent):
         fieldlist=self.standardMD.fieldList
         
 	for referenceTypeF in self.referencetypes:
-		#print referenceTypeF[1].title,referenceType	
+
 		if referenceTypeF[1].title.lower() == referenceType.lower():
-			#print "OK"
+
 			try:
 				bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
 				referenceType=referenceTypeF[1].title
@@ -783,7 +849,7 @@ class ECHO_resource(Folder,Persistent):
 			fields=bibdata[referenceType]
                         for field in fieldlist:
                             retdata[field]=referenceTypeF[1].getValue(field)[1]
-	#print retdata,fieldlist
+
         return retdata,fieldlist,temp,fields
 
     def findTagsFromMapping(self,referenceType):
@@ -826,16 +892,19 @@ class ECHO_resource(Folder,Persistent):
 
     def copyIndex_meta2echo_resource(self,RESPONSE=None):
 	    """copy MD von Index_meta to the echo_resource"""
-
+	    
 	    (metadict, error)=readMetadata(self.metalink)
 	    
 	    self.metaDataHash={}
 	    if not error=="": #Fehler beim Auslesen des Metafiles
 		    return "ERROR:",error
 	    fields=self.findTagsFromMapping(self.contentType)
+	    
 	    #fields=self.findLabelsFromMapping(self.contentType)
 	    for field in fields[1]:
+		    
 		    if self.isDefinedInThisSet(fields,field):
+			    #print urllib.unquote(metadict.get(self.getFieldTag(fields,field),''))
 			    self.setFieldValue(self.getFieldTag(fields,field),metadict.get(self.getFieldTag(fields,field),''))
 
 	    
@@ -934,10 +1003,10 @@ def manage_addECHO_resourceForm(self):
 
 
 
-def manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
+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"""
 
-    newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,responsible,credits,weight,coords)
+    newObj=ECHO_resource(id,link,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords)
 
     self._setObject(id,newObj)
 
@@ -986,7 +1055,7 @@ class ECHO_externalLink(Folder):
         if not hasattr(self,'coords'):
             
             self.coords=['']
-            #print "G",self.coords
+
 
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_externalLink.zpt').__of__(self)
         return pt()
@@ -1012,12 +1081,6 @@ class ECHO_externalLink(Folder):
         {'label':'Main Config','action':'ECHO_externalLink_config'},
         )
 
-    def getCredits(self):
-        """Ausgabe der credits"""
-        if self.credits:
-            return self.credits
-        else:
-            return []
         
     def index_html(self):
         """standard page"""
@@ -1079,6 +1142,34 @@ class ECHO_collection(Folder, Persistent
     viewClassificationList=viewClassificationListMaster
     displayTypes=displayTypes
 
+    def getPartnerCopyright(self,name,sonst="generic"):
+		"""gibt generisches copyright eines partners aus, sonst behalte jetzige einsteillung"""
+		#print "hi",name,sonst
+		#print getattr(self.partners,name).copyrightType
+		try:
+			partner=getattr(self.partners,name)
+			return partner.copyrightType
+		except:
+			print "error"
+			return sonst
+
+    def partnerSelector_HTML(self,selected=None):
+         """give type selector"""
+	 if not selected:
+		 retStr="<option selected>\n"
+	 else:
+		 retStr="<option>\n"
+		 
+	 try: # erste version copyrightTypes exists
+		 for partner in self.credits:
+			 if selected and (partner==selected):
+				 retStr+="""<option selected value="%s">%s\n"""%(partner,partner)
+			 else:                
+				 retStr+="""<option value="%s">%s\n"""%(partner,partner)
+	 except:
+		 """nothing"""
+	 return retStr
+ 
     def getViewClassification(self):
         if hasattr(self,'viewClassification'):
             return self.viewClassification
@@ -1301,7 +1392,8 @@ class ECHO_collection(Folder, Persistent
         for entry in entries:
 		if entry[1].meta_type == 'ECHO_resource':
 			entry[1].ECHO_getResourceMD(template="no")
-			#print "rerender",entry[1].getId()
+			entry[1].generate_title()
+
 		else:
 		   self.ECHO_rerenderLinksMD(entry[1])
 
@@ -1323,7 +1415,7 @@ class ECHO_collection(Folder, Persistent
             return []
         
     def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag="",bgcolour=""):
-        #print "CO",coords
+
 
         self.id = id
         """Festlegen der ID"""
@@ -1407,7 +1499,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
@@ -1415,6 +1507,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]
@@ -1778,14 +1871,17 @@ class ECHO_root(Folder,Persistent,Implic
 	    if not content or content=="":
 		    return ""
 	    ret="<%s>"%tag
-	    ret+=urllib.quote(content)
+	    #ret+=urllib.quote(content)
+	    ret+=content
+
 	    ret+="</%s>"%tag
 	    return ret
 
     def getValueFromClass(self,field,found):
 	    """retattribute falss existing"""
 	    try:
-		    return getattr(found,field)
+		    
+		    return getattr(found,field).decode('ascii','ignore')
 	    except:
 		    return ""
     
@@ -1859,7 +1955,32 @@ 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 first:
+		 if not selected:
+			 retStr="<option selected>\n"
+		 else:
+			 retStr="<option>\n"
+	 else:
+		 if not selected:
+			 retStr="""<option selected value="%s">%s\n"""%first
+		 else:
+			 retStr="""<option value="%s">%s\n"""%first
+
+	 
+	 try: # erste version copyrightTypes exists
+		 for copyrightType in self.ZopeFind(self.copyrightTypes,obj_metatypes=["ECHO_copyrightType"]):
+			 if selected and (copyrightType[0]==selected):
+				 retStr+="""<option selected value="%s">%s\n"""%(copyrightType[0],copyrightType[0])
+			 else:                
+				 retStr+="""<option value="%s">%s\n"""%(copyrightType[0],copyrightType[0])
+	 except:
+		 """nothing"""
+	 return retStr
+
+    def partnerSelector_HTML(self,selected=None):
          """give type selector"""
 	 if not selected:
 		 retStr="<option selected>\n"
@@ -1867,7 +1988,7 @@ class ECHO_root(Folder,Persistent,Implic
 		 retStr="<option>\n"
 		 
 	 try: # erste version copyrightTypes exists
-		 for copyrightType in self.ZopeFind(self.copyrightTypes,obj_metatypes=["ECHO_copyrightType"]):
+		 for copyrightType in self.ZopeFind(self.partners,obj_metatypes=["ECHO_partner"]):
 			 if selected and (copyrightType[0]==selected):
 				 retStr+="""<option selected value="%s">%s\n"""%(copyrightType[0],copyrightType[0])
 			 else:                
@@ -1875,6 +1996,25 @@ class ECHO_root(Folder,Persistent,Implic
 	 except:
 		 """nothing"""
 	 return retStr
+ 
+    mediaTypes=['all','text','images','sound','video'] # konfigurierbar in neuer version über echoroot??
+
+    def mediaTypeSelector_HTML(self,selected=None):
+         """give type selector"""
+	 if not selected:
+		 retStr="<option selected>\n"
+	 else:
+		 retStr="<option>\n"
+	 
+	 try: # erste version mediatypesTypes exists
+		 for mediaType in self.mediaTypes:
+			 if selected and (mediaType in selected):
+				 retStr+="""<option selected value="%s">%s\n"""%(mediaType,mediaType)
+			 else:                
+				 retStr+="""<option value="%s">%s\n"""%(mediaType,mediaType)
+	 except:
+		 """nothing"""
+	 return retStr
 
             
     def patchContentType(self,obj=None):
@@ -1903,7 +2043,7 @@ class ECHO_root(Folder,Persistent,Implic
 	def checkIfArrow(obj):
 		if hasattr(obj,'coords'):
 			for coordtemp in obj.coords:
-				#print obj.title,len(coordtemp)
+
 				if (len(coordtemp)>4) and not (coordtemp[4]==''):
 					return 4
 			return None
@@ -1975,7 +2115,7 @@ class ECHO_root(Folder,Persistent,Implic
             
             for word in words:
                 strUrl=url%word
-                #print "str",strUrl
+
                 retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word)
             str=retStr
         if str:
@@ -1986,27 +2126,48 @@ class ECHO_root(Folder,Persistent,Implic
     def link2html(self,str):
         """link2html fuer VLP muss hier noch raus"""
         if str:
-            #print str
+
             str=re.sub("\&","&amp;",str)
-            dom=xml.dom.minidom.parseString("<?xml version='1.0' ?><txt>"+str+"</txt>")
+            dom=xml.dom.minidom.parseString("<?xml version='1.0' encoding='utf-8'?><txt>"+str+"</txt>")
             links=dom.getElementsByTagName("link")
             
-            #print "link",links
+
             for link in links:
                 link.tagName="a"
                 ref=link.getAttribute("ref")
                 if self.checkRef(ref):
                     link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
 
-            return dom.toxml('utf-8')
+            newxml=dom.toxml('utf-8')
+	    match=re.sub(r'<\?xml version=\"1.0\" encoding=\"utf-8\"\?>\n<txt>','',newxml)
+	    match=re.sub(r'</txt>','',match)
+	    
+	    return match
+			   
         return ""
 
+    def xml2html(self,str):
+        """link2html fuer VLP muss hier noch raus"""
+        if str:
+
+            str=re.sub("\&","&amp;",str)
+            dom=xml.dom.minidom.parseString(str)
+            links=dom.getElementsByTagName("link")
+            
+
+            for link in links:
+                link.tagName="a"
+                ref=link.getAttribute("ref")
+                if self.checkRef(ref):
+                    link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
+
+            return dom.toxml('utf-8')
+        return ""
 
     def checkRef(self,ref):
         dbs={'vl_literature':'AND CD LIKE \'%lise%\'','vl_technology':'','vl_people':''}
         res=None
         for db in dbs.keys():
-            #print ref,"select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db])
 
             res=res or self.search(var=str("select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db])))
         return res
@@ -2015,7 +2176,7 @@ class ECHO_root(Folder,Persistent,Implic
 
     def PgQuoteString(self,string):
         """Quote string"""
-        #print "PG",string
+
         return libpq.PgQuoteString(string)
         
     def getPartners(self):
@@ -2137,6 +2298,49 @@ class ECHO_root(Folder,Persistent,Implic
 	    
 	    self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
 	    self.REQUEST.RESPONSE.write(ret)
+
+
+    def getMetaDatasXML(self,viewerType=None,filter=None):
+	    """gebe all ressourcen aus"""
+	    ret="""<?xml version="1.0" ?>
+	             <index>"""
+	    for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):
+
+		    echo_url=resource[1].absolute_url()
+		    if resource[1].getFullTextXML(noredirect="yes"):
+			    if hasattr(resource[1],'link'):
+				    viewer_url=echo_url+"/getMetaDataXML"
+			    else:
+				    viewer_url="NO URL"
+			    if filter:
+				    if re.search(filter,viewer_url):
+					    ret+="""\n<resource echoLink="%s" viewerLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?'))
+			    else:
+				    ret+="""\n<resource echoLink="%s" viewerLink="%s"/>"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?'))
+	    ret +="""\n</index>"""
+	    
+	    
+	    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 getPartnerFromID(self):
+        """find partner form ID return object"""
+        pa=self.REQUEST['partner']
+        par=self.ZopeFind(self.partners, obj_ids=[pa])
+        return par
+        
+    def getPartnerFromIDParameter(self, id):
+        """ find partners from ID"""
+        par=self.ZopeFind(self.partners, obj_ids=[id])
+        return par
+
+
         
 def manage_addECHO_root(self,id,title,RESPONSE=None):
     """Add an ECHO_root"""
@@ -2149,18 +2353,68 @@ def manage_addECHO_rootForm(self):
         """Nothing yet"""
         pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_root.zpt').__of__(self)
         return pt()
+
+class ECHO_copyrightType(Folder):
+	"""copyright typ"""
+
+	meta_type="ECHO_copyrightType"
+	
+	def __init__(self,id,title,label):
+		"""init"""
+		self.id=id
+		self.title=title
+		self.label=label
+
+	manage_options = Folder.manage_options+(
+        {'label':'Main Config','action':'ECHO_copyrightType_config_mainForm'},
+	)
+
+	def ECHO_copyrightType_config_mainForm(self):
+		"""change form"""
+		pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_copyrightType').__of__(self)
+		pt.content_type="text/html"
+		return pt()
+
+	def ECHO_copyrightType_config_main(self,title,label,RESPONSE=None):
+		"""change"""
+		self.title=title
+		self.label=label
+
+		if RESPONSE is not None:
+			RESPONSE.redirect('manage_main')
+
+def manage_addECHO_copyrightTypeForm(self):
+        """Form for adding a ressource"""
+        pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_copyrightTypeForm.zpt').__of__(self)
+        return pt()
+
+
+def manage_addECHO_copyrightType(self,id,title,label,RESPONSE=None):
+    """addaresource"""
+
+    newObj=ECHO_copyrightType(id,title,label)
+
+    self._setObject(id,newObj)
+
+    if RESPONSE is not None:
+        RESPONSE.redirect('manage_main')
+ 
+
  
 class ECHO_partner(Image,Persistent):
     """ECHO Partner"""
 
     meta_type="ECHO_partner"
 
-    def __init__(self, id, title,url, file, 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
         data, size = self._read_data(file)
         content_type=self._get_content_type(file, data, id, content_type)
         self.update_data(data, content_type, size)
@@ -2169,9 +2423,14 @@ class ECHO_partner(Image,Persistent):
         {'label':'Partner Information','action':'ECHO_partner_config'},
         )
 
-    def changeECHO_partner(self,url,RESPONSE=None):
+    
+    def changeECHO_partner(self,url,copyrightType,person, email, country, RESPONSE=None):
         """Change main information"""
         self.url=url
+        self.person=person
+        self.email=email
+        self.country=country
+        self.copyrightType=copyrightType
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
             
@@ -2190,7 +2449,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.
@@ -2209,7 +2468,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.