--- ECHO_content/ECHO_collection.py	2006/07/03 17:29:20	1.271
+++ ECHO_content/ECHO_collection.py	2006/07/27 15:27:34	1.272
@@ -1015,6 +1015,25 @@ class ECHO_resource(CatalogAware,Folder,
                 else:
                         return ''
                         
+    def getOwnerOriginalsHTML(self):
+               """gibt Liste der foerdernden Institutionen aus"""
+               
+               if hasattr(self,'ownerOriginal'):
+                       obj=self.ownerOriginal
+                       ret=obj.getOwner()
+                       return ret
+               else:
+                       return ''
+    
+    def getDigiCopyByHTML(self):
+               """gibt Liste der foerdernden Institutionen aus"""
+               
+               if hasattr(self,'digiCopyBy'):
+                       obj=self.digiCopyBy
+                       ret=obj.getDigiCopyBy()
+                       return ret
+               else:
+                       return ''                    
     
     def getCredits(self):
         """Ausgabe der credits"""
@@ -1270,8 +1289,12 @@ class ECHO_resource(CatalogAware,Folder,
                 
                     self.copyIndex_meta2echo_resource()
             try:
+
+
                     return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix=digiliburlprefix)
             except:
+		    #print self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix
+
                     return writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix=digiliburlprefix)
 
     def showMetaDataXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
@@ -1753,7 +1776,71 @@ class ECHO_link(ECHO_externalLink):
 #                
 #                        return ret
 #        
-
+        def getCopyrightsHTML(self):
+            """gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""
+            
+            if hasattr(self,'copyrightModel'):
+                    obj=self.copyrightModel
+                    
+            else:
+                    return "ERROR"
+            ret=[]
+            
+            for copyright in obj.getCopyrights(): #copyright - media / partner / copyrightID
+                    
+                    
+                    try:
+                        if hasattr(self.copyrightTypes,copyright[2]):
+                             copyrightTypeObj=getattr(self.copyrightTypes,copyright[2])
+                             link="copyrightTypes/"+copyright[2]+'/copyright.html'
+                        else:
+                             copyrightTypeObj=getattr(obj,copyright[2])
+                             link="copyrightModel/"+copyright[2]+'/copyright.html'
+                             
+                        label=copyrightTypeObj.label
+                        url=getattr(copyrightTypeObj, 'url', '')
+                            
+                        if url!='':
+                                 ret.append((url,copyright[0],copyright[1],copyright[2],label))
+                        else:
+                                if hasattr(copyrightTypeObj, 'copyright.html'):
+                                     ret.append(("""%s?partner=%s"""%(link,copyright[1]),copyright[0],copyright[1],copyright[2],label))
+                                else:
+                                     ret.append(('empty',copyright[0],copyright[1],copyright[2],label))
+                    except:
+                            """nothing"""
+                    
+            return ret
+            
+        def getInstitutionsHTML(self):
+                """gibt Liste der foerdernden Institutionen aus"""
+                
+                if hasattr(self,'support'):
+                        obj=self.support
+                        ret=obj.getSupporter()
+                        return ret
+                else:
+                        return ''
+                        
+        def getOwnerOriginalsHTML(self):
+               """gibt Liste der foerdernden Institutionen aus"""
+               
+               if hasattr(self,'ownerOriginal'):
+                       obj=self.ownerOriginal
+                       ret=obj.getOwner()
+                       return ret
+               else:
+                       return ''
+    
+        def getDigiCopyByHTML(self):
+               """gibt Liste der foerdernden Institutionen aus"""
+               
+               if hasattr(self,'digiCopyBy'):
+                       obj=self.digiCopyBy
+                       ret=obj.getDigiCopyBy()
+                       return ret
+               else:
+                       return ''
                 
         def index_html(self):
                 """standard link"""
@@ -2193,11 +2280,13 @@ class ECHO_collection(CatalogAware, Fold
                  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)
+                 for partner in self.getPartners():
+                         partnerTitle = partner.title
+                         partnerId = partner.__name__
+                         if selected and (partnerId==selected):
+                                 retStr+="""<option selected value="%s">%s\n"""%(partnerId,partnerTitle)
                          else:                
-                                 retStr+="""<option value="%s">%s\n"""%(partner,partner)
+                                 retStr+="""<option value="%s">%s\n"""%(partnerId,partnerTitle)
          except:
                  """nothing"""
          return retStr
@@ -3466,7 +3555,10 @@ class ECHO_root(Folder,Persistent,Implic
     def getPartners(self):
         """Get list of Partners. Presently only from a subfolder partners"""
         if hasattr(self,'partners'):            
-                return [ item[1] for item in self.partners.ZopeFind(self.partners,obj_metatypes=['ECHO_partner'])]
+                ret = [ item[1] for item in self.partners.ZopeFind(self.partners,obj_metatypes=['ECHO_partner'])]
+                def sort_title(one, another) : return cmp(one.title, another.title)
+                ret.sort(sort_title)
+                return ret
         else:
                 return []
   
@@ -3898,6 +3990,119 @@ def manage_addECHO_support(self, id,inst
         if RESPONSE is not None:
                 RESPONSE.redirect('manage_main')
                 
+# ECHO - owner of original
+class ECHO_ownerOriginal(Folder,ECHO_basis):
+        """besitzer des originals"""
+        meta_type="ECHO_ownerOriginal"
+        security=ClassSecurityInfo()
+        
+        
+        def __init__(self,id,institutions=None):
+                """init"""
+                self.id=id
+                self.title=''
+                self.institutions=toList(institutions)
+
+        security.declarePublic('getOwner')
+        def getOwner(self):
+                """return institutions"""
+                if self.institutions:
+                        return self.institutions
+                else:
+                        return []
+                
+        manage_options = Folder.manage_options+(
+                {'label':'Main Config','action':'ECHO_ownerOriginal_configForm'},
+                )
+
+        def ECHO_ownerOriginal_configForm(self):
+                """change form"""
+                pt=zptFile(self, 'zpt/ChangeECHO_ownerOriginal')
+                pt.content_type="text/html"
+                return pt()
+
+        def ECHO_ownerOriginal_config(self,institutions=None,RESPONSE=None):
+                """change"""
+                self.institutions=toList(institutions)
+
+                if RESPONSE is not None:
+                        RESPONSE.redirect('manage_main')
+
+                
+def manage_addECHO_ownerOriginalForm(self):
+    """Form for adding"""
+    pt=zptFile(self, 'zpt/AddECHO_ownerOriginal.zpt')
+    return pt()
+
+def manage_addECHO_ownerOriginal(self, id,institutions=None,RESPONSE=None):
+        """add the copyright"""
+
+        meta_type="ECHO_ownerOriginal"
+        
+        
+        self._setObject(id, ECHO_ownerOriginal(id,institutions))
+
+        if RESPONSE is not None:
+                RESPONSE.redirect('manage_main')
+                
+# --------------------------------------------------------------------------------             
+
+# ECHO - digitized copy by
+class ECHO_digiCopyBy(Folder,ECHO_basis):
+        """besitzer des originals"""
+        meta_type="ECHO_digiCopyBy"
+        security=ClassSecurityInfo()
+        
+        
+        def __init__(self,id,institutions=None):
+                """init"""
+                self.id=id
+                self.title=''
+                self.institutions=toList(institutions)
+
+        security.declarePublic('getDigiCopyBy')
+        def getDigiCopyBy(self):
+                """return institutions"""
+                if self.institutions:
+                        return self.institutions
+                else:
+                        return []
+                
+        manage_options = Folder.manage_options+(
+                {'label':'Main Config','action':'ECHO_digiCopyBy_configForm'},
+                )
+
+        def ECHO_digiCopyBy_configForm(self):
+                """change form"""
+                pt=zptFile(self, 'zpt/ChangeECHO_digiCopyBy')
+                pt.content_type="text/html"
+                return pt()
+
+        def ECHO_digiCopyBy_config(self,institutions=None,RESPONSE=None):
+                """change"""
+                self.institutions=toList(institutions)
+
+                if RESPONSE is not None:
+                        RESPONSE.redirect('manage_main')
+
+                
+def manage_addECHO_digiCopyByForm(self):
+    """Form for adding"""
+    pt=zptFile(self, 'zpt/AddECHO_digiCopyBy.zpt')
+    return pt()
+
+def manage_addECHO_digiCopyBy(self, id,institutions=None,RESPONSE=None):
+        """add the copyright"""
+
+        meta_type="ECHO_digiCopyBy"
+        
+        
+        self._setObject(id, ECHO_digiCopyBy(id,institutions))
+
+        if RESPONSE is not None:
+                RESPONSE.redirect('manage_main')
+                
+# --------------------------------------------------------------------------------  
 
 class ECHO_institution(Image,Persistent,ECHO_basis):
     """ECHO Institution"""