--- ECHO_content/ECHO_collection.py	2005/11/11 15:41:26	1.253
+++ ECHO_content/ECHO_collection.py	2008/11/20 10:45:15	1.298
@@ -15,11 +15,12 @@ try:
 except:
         print "PDF generation will not work"
      
-
+import urlparse
 import string
 import tempfile
+import zipfile
 import re
-import os
+import os,shutil
 import OFS.Image
 from types import *
 from OFS.Cache import Cacheable
@@ -34,12 +35,14 @@ from Globals import DTMLFile
 import Globals
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
-from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
+from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate,manage_addPageTemplate
 from Globals import Persistent, package_home
 from Acquisition import Implicit
 from Products.ZCatalog.CatalogPathAwareness import CatalogAware
+from Products.ZCTextIndex.ZCTextIndex import manage_addLexicon
 
 import urllib
+import urllib2
 import cgi
 import smtplib
 import time
@@ -49,7 +52,8 @@ from Ft.Xml import EMPTY_NAMESPACE
 
 import Ft.Xml.XPath
 import cStringIO
-import zLOG
+
+import sys
 
 try:
         from psycopg import libpq
@@ -65,11 +69,30 @@ import urllib
 import xml.dom.minidom
 import ECHO_helpers
 from ECHO_helpers import *
-from ECHO_language import *
+
+try:
+ from ECHO_language import *
+except:
+    print "no echo_language"
+    class ECHO_language:
+        """ leere Klasse"""
+        pass
+
 from ECHO_movie import *
 import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
+import xmlrpclib
 
-            
+import logging
+
+#ersetzt logging.info
+def logger(txt,method,txt2):
+    """logging"""
+    logging.info(txt+ txt2)
+
+def normalizeCt(str):
+        """normalizes content_type"""
+        #str= str.replace(" ","_")
+        return str.replace("-"," ").lower()
 
 def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs=""):
 
@@ -83,18 +106,105 @@ def setECHO_collectionInformation(self,t
         self.credits=toList(credits)
         self.weight=weight
 
+class ECHO_partner(Image,Persistent,ECHO_basis):
+    """ECHO Partner"""
+
+    meta_type="ECHO_partner"
+
+    def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''):
+        self.__name__=id
+        self.title=title
+        self.url=url
+        self.person=person
+        self.email=email
+        self.country=country
+        self.color=color
+        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)
+
+    manage_options = Image.manage_options+(
+        {'label':'Partner Information','action':'ECHO_partner_config'},
+        )
+
+    
+    def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None):
+        """Change main information"""
+        self.url=url
+        self.person=person
+        self.email=email
+        self.country=country
+        self.color=color
+        self.copyrightType=copyrightType
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage_main')
+            
+            
+
+    def ECHO_partner_config(self):
+        """Main configuration"""
+        if not hasattr(self,'url'):
+            self.url=""
+        pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt')
+        return pt()
+
+        
+manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(),
+                             Kind='ECHO_partner',kind='ECHO_partner')
+
+
+
+def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='',
+                    REQUEST=None):
+    """
+    Add a new ECHO_partner object.
+
+    Creates a new ECHO_partner object 'id' with the contents of 'file'.
+    Based on Image.manage_addImage
+    """
+
+    id=str(id)
+    title=str(title)
+    content_type=str(content_type)
+    precondition=str(precondition)
+
+    id, title = OFS.Image.cookId(id, title, file)
+
+    self=self.this()
+
+    # First, we create the image without data:
+    self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, 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.
+    if file:
+        self._getOb(id).manage_upload(file)
+    if content_type:
+        self._getOb(id).content_type=content_type
+
+    if REQUEST is not None:
+        try:    url=self.DestinationURL()
+        except: url=REQUEST['URL1']
+        REQUEST.RESPONSE.redirect('%s/manage_main' % url)
+    return id
+
 class ECHO_locale(ZopePageTemplate):
         """localisierung"""
 
         meta_type="ECHO_locale"
 
         def __init__(self,id,lang,title,label,text=None,content_type=None):
-                self.lang=lang
-                self.title=title
-                self.label=label
-                if text:
-                        self.pt_edit(text, content_type)
-                self.id=id
+            self.lang=lang
+            self.title=title
+            self.label=label
+            # default content
+            if not text:
+                text = open(self._default_content_fn).read()
+                content_type = 'text/html'
+            self.pt_edit(text, content_type)
+            self.id=id
 
         manage_options = ZopePageTemplate.manage_options+(
                 {'label':'Main Config','action':'change_ECHO_localeForm'},
@@ -111,6 +221,8 @@ class ECHO_locale(ZopePageTemplate):
                 self.title=title
                 self.label=label
                 if not text is None:
+                        if content_type is None:
+                            content_type = self.content_type
                         self.pt_edit(text, content_type)
 
                 if RESPONSE is not None:
@@ -200,6 +312,8 @@ class ECHO_layoutTemplate(ZopePageTempla
         if text is None:
             self._default_content_fn = os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%EchoType)
             text = open(self._default_content_fn).read()
+        if content_type is None:
+            content_type = self.content_type
         self.pt_edit(text, content_type)
 
 
@@ -257,7 +371,10 @@ class ECHO_fullText(ZopePageTemplate,ECH
         def getPage(self,nr='1'):
                 """get page n"""
                 #return self().encode('latin-1','ignore')
-                dom=xml.dom.minidom.parseString(self().encode('utf-8','ignore'))
+                try:
+                   dom=xml.dom.minidom.parseString(self())
+                except:
+                   dom=xml.dom.minidom.parseString(self().encode('latin-1'))
                 pages=dom.getElementsByTagName('page')
                 
                 return pages[int(nr)-1].toxml()
@@ -312,9 +429,25 @@ class ECHO_resource(CatalogAware,Folder,
 
     getSubCols = ECHO_helpers.getSubCols
 
+    def index_meta(self,RESPONSE=None):
+        """ gibt das im metalink gespeicher xml-file zurueck"""
+        url = self.metalink
+        txt=""
+        logging.debug("ml:%s"%url)
+        try:
+            page = urllib.urlopen(url);
+            if RESPONSE:
+                RESPONSE.setHeader("Content-Type","text/xml")
+            
+            txt = page.read();
+        except:
+            logging.error("Cannot read metadata of: %s"%self.getId())
+        
+        return txt
+        
     def reindex(self):
         """generate fields for indexing and reindex"""
-        import urlparse
+        
         #TODO: korrigieren des metalink pfades konfigurierbar machen
         splitted= [x for x in urlparse.urlparse(self.metalink)]
         splitted[1]="foxridge.mpiwg-berlin.mpg.de"[0:]
@@ -427,73 +560,134 @@ class ECHO_resource(CatalogAware,Folder,
             return ret+self.createSubElementRDF(urn=urn) 
 
   
-    def getAccessRightSelectorHTML(self,outlook="select"):
-            """htmlselector"""
-            values=['free','mpiwg']
+    def changeAccessRightForm(self,preselect=None):
+        """change the access rights"""
+        
+        pt=zptFile(self, 'zpt/ChangeECHO_resourceAccessRight.zpt')
+        return pt(preselect=preselect)
+    
+    def changeAccessRight(self):
+        """changeRights"""
+        argv=self.REQUEST.form
+        self.setAccessRightXML(argv["%s_xml"%self.getId()])
+        self.accessRight=argv["%s_echo"%self.getId()]
+         
+        self.REQUEST.RESPONSE.redirect('manage_main')
+        
+    
+    def getAccessRightSelectorHTML(self,outlook="select",xmldominant=None,preselect=None):
+            """htmlselector, xmldominant= in der regel wird der wert des xmlfiles ausgegeben ausser er existiert nicht"""
+            values=['','free','MPIWG']
             
+            if preselect:#set all to the preselected
+                ar=(preselect,preselect)
+            else:#else set to actual value
+                ar=self.getAccessRightMD()
+                
             if outlook=="select":
-                    ret="""<select name="%s">"""%self.getId()
-
+                    ret="""<select name="%s_xml">"""%self.getId()
+                    ret1="""<select name="%s_echo">"""%self.getId()
                     for value in values:
-                            if value==self.getAccessRightMD():
+                            if value==ar[0]:
                                     ret+="<option selected>%s</option>"%value
                             else:
                                     ret+="<option>%s</option>"%value
-                    return ret+"</select>"
+                            
+                            if value==ar[1]:
+                                    ret1+="<option selected>%s</option>"%value
+                            else:
+                                    ret1+="<option>%s</option>"%value
+                    
+                    
+                    if not xmldominant:
+                        return ret+"</select>",ret1+"</select>"
+                    else:
+                        if ar[0] is not None:
+                            return ret+"</select>"
+                        else:
+                            return "<p>No xml file (only local selection):"+ret1
 
             else:
                     ret=""
+                    ret1=""
                     for value in values:
                             
-                            if value==self.getAccessRightMD():
-                                    ret+="""<input type="radio" name="%s" value="%s" checked>%s"""%(self.getId(),value,value)
+                            if value==ar[0]:
+                                    ret+="""<input type="radio" name="%s_xml" value="%s" checked>%s"""%(self.getId(),value,value)
                             else:
-                                    ret+="""<input type="radio" name="%s" value="%s">%s"""%(self.getId(),value,value)
-                    return ret
+                                    ret+="""<input type="radio" name="%s_xml" value="%s">%s"""%(self.getId(),value,value)
+                                    
+                            if value==ar[1]:
+                                    ret1+="""<input type="radio" name="%s_echo" value="%s" checked>%s"""%(self.getId(),value,value)
+                            else:
+                                    ret1+="""<input type="radio" name="%s_echo" value="%s">%s"""%(self.getId(),value,value)
+
+                    if not xmldominant:                        
+                        return ret,ret1
+                    else:                         
+                        if ar[0]:
+                            return ret
+                        else:
+                            return "<p>No xml file (only local selection)</p>"+ret1
 
 
+
+    def copyAccessRightsFromMD(self):
+            """kopiere rechte aus den metadaten"""
+            self.accessRight=self.getAccessRightMD()[0]
+            
+            
+            
+            
     
     def getAccessRightMD(self):
                 """set accessright"""
                 url=self.metalink
 
                 try:
-                        geturl=""
-                        for line in ECHO_helpers.urlopen(url).readlines():
-                                geturl=geturl+line
-
-
+                    urllib.urlopen(url)
                 except:
-                        return (None,"Cannot open: "+url)
+                    logger("ECHO_Resource (getAccessRightMD)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
 
+                    return None,getattr(self,'accessRight','')
+                
+            
                 try:
-                        dom=xml.dom.minidom.parseString(geturl)
-                        root=dom.getElementsByTagName('resource')[0]
+                        dom = NonvalidatingReader.parseUri(url)
                 except:
-                        return (None,"Cannot parse: "+url+"<br>"+geturl)
+                        logger("ECHO_Resource (getAccessRightMD)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
+                        return (None,"Cannot parse: "+url+"<br>"+"%s (%s)"%sys.exc_info()[0:2])
 
-                internal=dom.getElementsByTagName('internal')
-                if internal:
-                        institution=dom.getElementsByTagName('institution')
-                        return getText(institution[0].childNodes)
-                
-                free=dom.getElementsByTagName('free')
-                if free:
-                        return "free"
 
-                return "free" #default free
+                accessright=dom.xpath("//meta/access-conditions/access/@type")
+                if accessright:
+                    accessright=accessright[0].value
+                if str(accessright)=='institution':
+                    tmp=dom.xpath("//meta/access-conditions/access/name")
+                    if tmp:
+                        accessright=getTextFromNode(tmp[0])
+                    
+                if not accessright:
+                    accessright=""
+                
+                return accessright,getattr(self,'accessRight','')             
 
     def changeAccessRightMD(self,accessright,RESPONSE=None):
-            """change the rights"""
-            
+            """change the rights - not user anymore"""
+            #TODO: check if method still needed
             params="accessright=%s"%accessright
 
 
             #print ECHO_helpers.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read()
 
+            tries=0
+            for i in range(10):
+                    x=ECHO_helpers.urlopen('http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/setAccessRightXML'+urllib.quote('?'+params))).read()
+                    if x=="ok":
+                           
+                            break;
+                 
             
-            ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/setAccessRightXML'+urllib.quote('?'+params))).read()
-
           
             if RESPONSE is not None:
                         RESPONSE.redirect('manage_main')
@@ -502,7 +696,13 @@ class ECHO_resource(CatalogAware,Folder,
     def setAccessRightXML(self,accessright):
                 """set accessright"""
                 url=self.metalink
-
+                accessrights=['MPIWG','free']#allowes rights
+                
+                if accessright =='':
+                    """do nothing"""
+                    return ""
+                    
+                    
                 try:
                         geturl=""
                         for line in ECHO_helpers.urlopen(url).readlines():
@@ -518,48 +718,59 @@ class ECHO_resource(CatalogAware,Folder,
                 except:
                         return (None,"Cannot parse: "+url+"<br>"+geturl)
 
-                metanodes=dom.getElementsByTagName('access-conditions')
+                metamains=dom.getElementsByTagName('meta')
+                
+                if not metamains:
+                        nodenew=dom.createElement('meta')
+                        root.appendChild(nodenew)
+                        metamain=nodenew
+                else:
+                        metamain=metamains[0]
+                
+                
+                metanodes=metamain.getElementsByTagName('access-conditions')
 
                 if not metanodes:
                         nodenew=dom.createElement('access-conditions')
-                        root.appendChild(nodenew)
+                        metamain.appendChild(nodenew)
                         metanode=nodenew
                 else:
                         metanode=metanodes[0]
 
                 accesses=metanode.getElementsByTagName('access')
 
-                if not accesses:
-                        nodenew2=dom.createElement('access')
-                        metanode.appendChild(nodenew2)
-                        metanode2=nodenew2
-                else:
-                        metanode2=accesses[0]
-
-                internal=metanode.getElementsByTagName('internal')
-
-                if internal:
-                        metanode2.removeChild(internal[0]).unlink()
+                #delete old
+                if accesses:
+                     metanode.removeChild(accesses[0]).unlink()
 
-                free=metanode.getElementsByTagName('free')
+                #create new
+                    
+                nodenew2=dom.createElement('access')
+                metanode.appendChild(nodenew2)
+                metanode2=nodenew2
                 
-                if free:
-                        metanode2.removeChild(internal[0]).unlink()
-
-
-                if accessright=='free':
-                        nodenew3=dom.createElement('free')
-                        metanode2.appendChild(nodenew3)
-                elif accessright=='mpiwg':
-                        nodenew3=dom.createElement('internal')
-                        nodenew4=dom.createElement('institution')
-                        metanodetext=dom.createTextNode('mpiwg')
+                attribute=metanode2.getAttribute('type')
+                
+                if accessright=="free":
+                    
+                     metanode2.setAttribute('type','free')
+                
+                elif accessright.upper()=='MPIWG':
+                        metanode2.setAttribute('type','institution')
+                        nodenew4=dom.createElement('name')
+                        metanodetext=dom.createTextNode('MPIWG')
                         nodenew4.appendChild(metanodetext)
-                        nodenew3.appendChild(nodenew4)
-                        metanode2.appendChild(nodenew3)
-
-                return dom.toxml().encode('utf-8')
+                        nodenew2.appendChild(nodenew4)
+                #print dom.toxml().encode('utf-8')
+                string= encodeRPC(dom.toxml().encode('utf-8'))
+                
+                #TODO: make server configurable
+                server=xmlrpclib.Server("http://foxridge.mpiwg-berlin.mpg.de/server")
 
+                path=urlparse.urlparse(self.metalink)[2]
+         
+                server.writeMetaDataFile(path,string,"yes")
+        
     def setStartPageForm(self):
             """Form for changing the startpage"""
 
@@ -580,7 +791,7 @@ class ECHO_resource(CatalogAware,Folder,
 
 
             if (not resourcepath) or (not digiliburlprefix) or (not images):
-                    zLOG.LOG("ECHO (createImageUrl)",zLOG.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())
+                    logger("ECHO (createImageUrl)",logging.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())
                     return None
             resourcepath=resourcepath.replace('/mpiwg/online','')
             if not digiliburlprefix: digiliburlprefix="http://echo.mpiwg-berlin.mpg.de/zogilib?"
@@ -634,9 +845,14 @@ class ECHO_resource(CatalogAware,Folder,
     
             params="startpage=%s"%startpage
             #print 'http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))
-                                                                                                                                 
-            ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))).read()
-        
+               
+            tries=0
+            for i in range(10):
+                    x=ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))).read()
+                    if x=="ok":
+                           
+                            break;
+                 
             
             path=self.metalink
             
@@ -665,6 +881,11 @@ class ECHO_resource(CatalogAware,Folder,
             return pt()
 
 
+    def setLink(self, link=None):
+        """change link field"""
+        if link is not None:
+            self.link = link
+            
    
     def getTextToolsField(self,name,default=''):
         """Lese Textoolsfelder aus index.meta im path aus"""
@@ -694,9 +915,17 @@ class ECHO_resource(CatalogAware,Folder,
 
             params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s&digiliburlprefix=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix)
 
-            
-            ECHO_helpers.urlopen('http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))).read()
-
+            try:
+                tries=0
+                for i in range(10):
+                        x=ECHO_helpers.urlopen('http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))).read()
+                        if x=="ok":
+                           
+                            break;
+                 
+            except:
+                logger("ECHO_ressource (changeViewerTemplateSet)", logging.ERROR,"%s (%s)"%sys.exc_info()[0:2])          
+                logger("ECHO_ressource (changeViewerTemplateSet)", logging.ERROR,'http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)))
             #print self.absolute_url()+'/newMetaXML'+urllib.quote'?'+params)
             # hack Pfad auf die Dokumente
             path=self.metalink
@@ -705,22 +934,15 @@ class ECHO_resource(CatalogAware,Folder,
 
             path=re.sub('/index.meta','',path) 
 
-            path=re.sub(self.REQUEST['SERVER_URL'],'',path)
-            path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path)
-
-            path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
-            path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
-            path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server
-
-            path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server
-            path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
-            path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server
-            path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo
-
-            path=re.sub('http://vision.rz-berlin.mpg.de','',path) # falls vision als server
-
-            return ECHO_helpers.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+            #TODO: direct access to the file system necessary, fix that also xmlrpc to the server where the index file is stored is possible    
+            parsedUrl=urlparse.urlparse(path)
+            path=parsedUrl[2]
 
+            try:        
+                return ECHO_helpers.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+            except:
+                logger("ECHO_Resource (changeViewerTemplateSet)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
+                logger("ECHO_Resource (changeViewerTemplateSet)", logging.INFO,"http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)
 
             if RESPONSE is not None:
                         RESPONSE.redirect('manage_main')
@@ -742,17 +964,17 @@ class ECHO_resource(CatalogAware,Folder,
             """getFullTextXML; gives the FullText as an XML Document, and <error></error> if somthing goes wrong."""
 
             try:
-                    #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"open %s"%self.metalink)
+                    #logger("ECHO Fulltext",logging.INFO,"open %s"%self.metalink)
                     fh=ECHO_helpers.urlopen(self.metalink)
-                    #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"opened %s"%self.metalink)
+                    #logger("ECHO Fulltext",logging.INFO,"opened %s"%self.metalink)
                     dom=xml.dom.minidom.parse(fh)
                     texttools=dom.getElementsByTagName('texttool')
                     text=texttools[0].getElementsByTagName('text')
                     texturl=getText(text[0].childNodes)
 
-                    #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"found %s"%texturl)
+                    #logger("ECHO Fulltext",logging.INFO,"found %s"%texturl)
                     fh.close()
-                    #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh")
+                    #logger("ECHO Fulltext",logging.INFO,"closed fh")
                     #keine url
                     if not (texturl.split(":")[0] in ['http','ftp','file']): 
                         if not noredirect:
@@ -762,7 +984,7 @@ class ECHO_resource(CatalogAware,Folder,
 
                     if not noredirect:
                             self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')  
-                            zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl)
+                            logger("ECHO Fulltext",logging.INFO,"redirect to:%s"%texturl)
                             self.REQUEST.RESPONSE.redirect(texturl)
                     else:
                             return texturl
@@ -856,6 +1078,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"""
@@ -896,7 +1137,7 @@ class ECHO_resource(CatalogAware,Folder,
 
     def getContentType(self):
             try:
-                    return self.contentType
+                    return normalizeCt(self.contentType)
             except:
                     return ""
 
@@ -954,8 +1195,60 @@ class ECHO_resource(CatalogAware,Folder,
 
 
     
+    def changeViewer(self,newViewer):
+        """set newViewer to the url of the new viewer
+        only if metalink is set, otherwise it gives false
+        """
+        
+        texterUrl="http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Texter?fn=/"
+        
+        vl,msg=self.checkValidityOfMetaLink()
+        
+        if not vl: #ungueltiger link, versuche neuen
+            newStr=re.match(".*/mpiwg/online/(.*)",self.metalink) # suche pfad hinter /mpiwg/online 
+            oldLink=self.metalink
+            
+            if newStr:
+                self.metalink=texterUrl+newStr.group(1)
+                vl,msg=self.checkValidityOfMetaLink()
+            else:
+                logging.error("change Viewer XX(mew Metadatafile) %s"%self.metalink)
+                vl=False
+                
+            if not vl: # geht immer noch nicht, dann setzte wieder zurueck
+                self.metalink=oldLink
+            
+            logging.info("change Viewer (mew Metadatafile) %s"%self.metalink)
+           
+        if vl:
+            self.newViewer=newViewer
+            return vl,msg
+        else:
+            return vl,msg
+    
+    def checkValidityOfMetaLink(self):
+        """checks if the metalink is valid xml"""
+        
+        ml=self.metalink
+        
+        try:
+            txt=urllib.urlopen(ml)
 
-    def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,RESPONSE=None):
+        except:
+            return False,"Cannot open: %s)"%ml
+        
+        txt.close()        
+        try:
+            dom = NonvalidatingReader.parseUri(ml)
+        except:
+            return False, "Connot parse: %s)"%ml
+        
+        if len(dom.xpath("//texttool"))==0:
+            return False, "No texttools: %s)"%ml
+            
+        return True,""
+        
+    def changeECHO_resource_main(self,metalink,link,title,label,description,contentType,renderingType,weight,resourceID,newViewer='',RESPONSE=None):
         """Aenderung der Properties"""
         self.resourceID=resourceID
         self.title=title
@@ -969,6 +1262,9 @@ class ECHO_resource(CatalogAware,Folder,
         self.link=link
         self.metalink=metalink
         
+        self.newViewer=newViewer
+        
+        
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
@@ -1011,7 +1307,7 @@ class ECHO_resource(CatalogAware,Folder,
 
     def changeECHO_resource_metadata_local(self,RESPONSE=None):
             """change metadata"""
-            tags=self.findTagsFromMapping(self.contentType)
+            tags=self.findTagsFromMapping(normalizeCt(self.contentType))
             for field in tags[1]:
                     self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)][0:]
                         
@@ -1022,42 +1318,70 @@ class ECHO_resource(CatalogAware,Folder,
 
     def changeECHO_resource_metadata(self,RESPONSE=None):
             """change metadata"""
-            tags=self.findTagsFromMapping(self.contentType)
+            tags=self.findTagsFromMapping(normalizeCt(self.contentType))
             self.OSAS_meta={}
             for field in tags[1]:
                     try:
                             self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)]
                             self.OSAS_meta[self.getFieldTag(tags,field)]=self.REQUEST.form['OSAS_%s'%self.getFieldTag(tags,field)]
                     except:
-                            """nothing"""
-
-            ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML')).read()
+                            logger("ECHO_collection (changeECHO_resource_metadata)",logging.ERROR,"%s (%s)"%sys.exc_info()[0:2])
 
+            print self.newMetaXML()
+            tries=0
+            for i in range(10):
+                    x=ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML')).read()
+                    if x=="ok":
+                           
+                            break;
+                 
+            
 
             if RESPONSE is not None:
                     RESPONSE.redirect('manage_main')
 
     
 
-
+    def getMDValueSimpleSearchField(self):
+            """returns value for simple search"""
+            
+            try:
+                return " ".join([self.getMDValue('title',generic="yes"),
+                             self.getMDValue('author',generic="yes"),
+                             self.getMDValue('year',generic="yes"),self.getTitle()])
+            except:
+                
+                #logger(" ECHO_collection(getMDSimpleSearchField)",logging.INFO," ".join([self.getMDValue('title',generic="yes"),
+                 #            self.getMDValue('author',generic="yes"),
+                  #           self.getMDValue('year',generic="yes"),'']))
+                return ""
+                             
     def getMDValue(self,fieldNameTest,empty=None,generic=None):
             """get md values"""
             #TODO: cache mappinghash
             
             fieldName=None
             if generic:
-                ct=self.contentType.replace(" ","_").lower()
-                
+                if self.contentType:
+                    ct=self.contentType.replace(" ","_").lower()
+                    ct=self.contentType.replace("-","_").lower()
+                else:
+                    logger("ECHO_collection (getMDValue)", logging.INFO, "no_content type for %s"%self.getId())
+                    ct=""
+                    
                 #caching
                 if not hasattr(self,'_v_mapHash'): #noch keine cachevariable
                     self._v_mapHash={}
-                    
+                
+                
+
                 tmp=self._v_mapHash.get(ct,None) 
                 if tmp: #teste ob type schon existiert
                     fieldName=tmp.get(fieldNameTest,None)
                 else:
                     self._v_mapHash[ct]={}
                     
+
                 #noch nicht gecached    
                 if not fieldName and hasattr(self.standardMD,ct):    
                     fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0]
@@ -1065,16 +1389,20 @@ class ECHO_resource(CatalogAware,Folder,
             if not fieldName:
                 fieldName=fieldNameTest  
             if not empty:
-  			   #FIXME: warum gibt es manchmal kein metadatahas
+                           #FIXME: warum gibt es manchmal kein metadatahas
                 try:
-                    return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
+                    
+                    ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%normalizeCt(self.contentType))
                 except:
-                    zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) 
+                    logger("ECHO (line 1069)",logging.ERROR,"no md hash for %s"%self.getId()) 
                     return ""
                   
             else:
 
-                return self.metaDataHash.get(fieldNameTest,empty)
+                   
+                   ret= self.metaDataHash.get(fieldNameTest,empty)
+               
+            return unicodify(ret)
 
     getFieldValue=getMDValue #depricated
 
@@ -1086,8 +1414,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):
@@ -1131,6 +1463,10 @@ class ECHO_resource(CatalogAware,Folder,
             self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
             return writeMetadata(self.metalink,self.metaDataHash)
 
+    def getMetaDataLink(self):
+        """get link to the meta data"""
+        return self.metalink
+    
     def changeECHO_resource(self,metalink,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
         """Aenderung der Properties"""
         
@@ -1150,6 +1486,7 @@ class ECHO_resource(CatalogAware,Folder,
         {'label':'Change TemplateSets and Image Viewer','action':'changeViewerTemplateSetForm'},
         {'label':'set/change startpage','action':'setStartPageForm'},
         {'label':'Copy MD for indexing and search','action':'copySearchFields'},
+        {'label':'Change AccessRights','action':'changeAccessRightForm'}, 
         )
 
 
@@ -1198,7 +1535,6 @@ class ECHO_resource(CatalogAware,Folder,
         if not hasattr(self,'metaDataHash'):
                 setattr(self,'metaDataHash',{})
         self.metaDataHash[field]=value[0:]
-        
 
     def copySearchFields(self):
             """copys metadatafields to the object"""
@@ -1223,11 +1559,12 @@ class ECHO_resource(CatalogAware,Folder,
         fields=[]
         fieldlist=self.standardMD.fieldList
 
-        tags=self.findTagsFromMapping(self.contentType)
+        tags=self.findTagsFromMapping(normalizeCt(self.contentType))
         self.referencetypes=tags[2]
         for referenceTypeF in self.referencetypes:
-
-                if referenceTypeF[1].title.lower() == referenceType.lower():
+                
+                
+                if normalizeCt(referenceTypeF[1].title) == normalizeCt(referenceType.lower()):
 
                         try:
                                 bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
@@ -1265,7 +1602,7 @@ class ECHO_resource(CatalogAware,Folder,
         for referenceTypeF in temp:
                 #print referenceType
         
-                if referenceTypeF[1].title.lower() == referenceType.lower(): 
+                if normalizeCt(referenceTypeF[1].title) == normalizeCt(referenceType.lower()):
                         try:
                                 bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields
                                 referenceType=referenceTypeF[1].title
@@ -1292,10 +1629,10 @@ class ECHO_resource(CatalogAware,Folder,
                     
                     return "ERROR:",error,self.absolute_url()
             
-            self.contentType=metadict['bib_type'][0:]
-            fields=self.findTagsFromMapping(self.contentType)
+            self.contentType=normalizeCt(metadict['bib_type'])[0:]
+            fields=self.findTagsFromMapping(normalizeCt(self.contentType))
             
-            #fields=self.findLabelsFromMapping(self.contentType)
+            #fields=self.findLabelsFromMapping(normalizeCt(self.contentType))
             for field in fields[1]:
                     
                     if self.isDefinedInThisSet(fields,field):
@@ -1307,12 +1644,12 @@ class ECHO_resource(CatalogAware,Folder,
             if RESPONSE:
                     return RESPONSE.redirect('manage_main')
             
-            return "OK:",self.absolute_url(),self.contentType
+            return "OK:",self.absolute_url(),normalizeCt(self.contentType)
         
     def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"):
         """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
         (metadict, error)=readMetadata(self.metalink)
-
+        
         if back:
             self.REQUEST.SESSION['back']=back
 
@@ -1320,25 +1657,27 @@ class ECHO_resource(CatalogAware,Folder,
                 return "ERROR:",error
         
         if (not self.contentType) or (overwrite=="yes"):
-                self.contentType=metadict['bib_type'].lower()
+                self.contentType=normalizeCt(normalizeCt(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
+        if not (normalizeCt(metadict['bib_type']).lower()==normalizeCt(self.contentType).lower()):
+                self.REQUEST.SESSION['contentStorage']=normalizeCt(metadict['bib_type'])
+                self.REQUEST.SESSION['contentZope']=normalizeCt(self.contentType)
 
                 return zptFile(self, 'zpt/ECHO_getResourceMDErrorContentType.zpt')()
 
-        self.REQUEST.SESSION['metadict']=metadict
-
+        #self.REQUEST.SESSION['metadict']=metadict
         
         
-        self.REQUEST.SESSION['diffs']=checkDiffs(self,self.REQUEST.SESSION['metadict'])
         
 
-                
+        self.REQUEST.SESSION['diffs']=checkDiffs(self,metadict)
+
+
         if template=="yes":
+                #pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/ECHO_resourceMD.zpt'),metadict=metadict).__of__(self)
                 pt=zptFile(self, 'zpt/ECHO_resourceMD.zpt')
-                return pt()
+                
+                return pt(metadict=metadict)
 
         
 
@@ -1369,6 +1708,11 @@ class ECHO_resource(CatalogAware,Folder,
                 self.REQUEST.RESPONSE.write(fh)
                 self.REQUEST.RESPONSE.close()
                 return 
+            
+        if getattr(self,'newViewer',''): #benutze den neuen viewer
+            url=self.newViewer+'url='+self.metalink+"&mode=texttool"
+            return self.REQUEST.RESPONSE.redirect(url)
+            
         return self.REQUEST.RESPONSE.redirect(self.link)
 
     def startpage_html(self):
@@ -1403,7 +1747,7 @@ class ECHO_resource(CatalogAware,Folder,
 
     def generate_label(self):
         """Erzeugt_standard_Label aus Template"""
-        pt=getattr(self,"label_template_"+self.contentType.lower())
+        pt=getattr(self,"label_template_"+normalizeCt(self.contentType).lower())
 
         self.label=pt()[0:]
         return pt()
@@ -1412,7 +1756,7 @@ class ECHO_resource(CatalogAware,Folder,
 
     def generate_title(self,RESPONSE=None):
         """Erzeugt_standard_Label aus Template"""
-        pt=getattr(self,"label_template_"+self.contentType.lower())
+        pt=getattr(self,"label_template_"+normalizeCt(self.contentType).lower())
 
         self.title=pt()[0:]
         
@@ -1448,18 +1792,14 @@ class ECHO_externalLink(Folder,ECHO_basi
         """template fuer content"""
         ret= ECHO_basis.content_html(self,'externalLink')
         
+        if type(ret) is StringType:
+            return ret.decode('utf-8')
+        else:
+           return ret
         
-        try:
-            return ret.encode('utf-8')
         
-        except:
-                    try: 
-                        return ret.decode('latin-1')
-                    except:
-             
-                        return ret
     
-    def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
+    def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType):
 
         self.id = id
         """Festlegen der ID"""
@@ -1474,6 +1814,8 @@ class ECHO_externalLink(Folder,ECHO_basi
         self.responsible=responsible
         coordsnew=[ string.split(x,",") for x in coords]
         self.coords=coordsnew
+        self.linkType = linkType        # Linktypen 'otherPresentation','external'
+        
 
     def ECHO_externalLink_config(self):
         """Main configuration"""
@@ -1489,25 +1831,50 @@ class ECHO_externalLink(Folder,ECHO_basi
         return pt()
     
 
-    def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
+    def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None,linkType='otherPresentation'):
         """Aenderung der Properties"""
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
 
         self.link=link
+        self.linkType = linkType
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
             
+    def getLinkType(self):
+        """ return linkType """
+        if hasattr(self,"linkType"):
+                return self.linkType
+        else :
+                return 'otherPresentation'
+
+    def setLinkType(self,type):
+        """ set linkType """
+        self.linkType = type
+        
+    def checkLink(self):
+        """ returns tuple (isWorking,Error) """        
+        try:
+            urllib2.urlopen(self.link)
+            return (True, '')
+        except urllib2.HTTPError, e:
+            return (False, e.code)
+        except urllib2.URLError, e:
+            return (False, str(e.reason))
+        except:
+            return (False, 'unknown Error')
             
-    manage_options = Folder.manage_options+(
+            
+    manage_options = (
         {'label':'Main Config','action':'ECHO_externalLink_config'},
         {'label':'Graphic Coords','action':'ECHO_graphicEntry'},
-        )
+        )+Folder.manage_options
 
         
     def index_html(self):
         """standard page"""
         
         return self.REQUEST.RESPONSE.redirect(self.link)
+            
 
 def manage_addECHO_externalLinkForm(self):
         """Form for external Links"""
@@ -1515,10 +1882,10 @@ def manage_addECHO_externalLinkForm(self
         return pt()
 
 
-def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None):
+def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None,linkType='otherPresentation'):
     """Add an external Link"""
 
-    newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords)
+    newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType)
 
     self._setObject(id,newObj)
 
@@ -1532,7 +1899,7 @@ class ECHO_link(ECHO_externalLink):
         meta_type="ECHO_link"
         
         manage_options = ECHO_externalLink.manage_options+(
-        	{'label':'add links config','action':'ECHO_link_addLinksForm'},
+                {'label':'add links config','action':'ECHO_link_addLinksForm'},
                 )
         
         def ECHO_link_addLinksForm(self):
@@ -1571,7 +1938,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"""
@@ -1592,7 +2023,7 @@ class ECHO_link(ECHO_externalLink):
                      params['backLink']=self.aq_parent.absolute_url()
                      params['startLink']=splitted[0]+"?"+urllib.urlencode(params)
                 
-                
+
                  return self.REQUEST.RESPONSE.redirect(splitted[0]+"?"+urllib.urlencode(params))
                 else:
                  return ""
@@ -1603,10 +2034,10 @@ def manage_addECHO_linkForm(self):
         return pt()
 
 
-def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,RESPONSE=None):
+def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,linkType="external",RESPONSE=None):
     """Add an external Link"""
 
-    newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)
+    newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType)
 
     self._setObject(id,newObj)
     
@@ -1616,16 +2047,100 @@ def manage_addECHO_link(self,id,title,la
         RESPONSE.redirect('manage_main')
         
 
-class ECHO_collection(Folder, Persistent, Implicit, Cacheable,ECHO_basis):
+class ECHO_collection(CatalogAware, Folder, Persistent, Implicit, Cacheable,ECHO_basis):
     """ECHO Collection"""
 
+    management_page_charset="utf-8"
     security=ClassSecurityInfo()
     meta_type='ECHO_collection'
+    default_catalog='resourceCatalog'
+    
 #    viewClassificationList=viewClassificationListMaster
     displayTypes=displayTypes
 
     path="/mpiwg/online/permanent/shipbuilding"
 
+    
+    def exportImportObjects_html(self,RESPONSE):
+        """ImportObject"""
+        pt=zptFile(self, 'zpt/exportImportObjects.zpt')
+        pt.content_type="text/html"
+        return pt()
+        
+    def importObjects_html(self,RESPONSE):
+        """ImportObject"""
+        pt=zptFile(self, 'zpt/importObjects.zpt')
+        pt.content_type="text/html"
+        return pt()
+   
+    def importObjects(self,zfile,RESPONSE=None,REQUEST=None):
+        """import object from file"""
+        
+        zf=zipfile.ZipFile(zfile,"r")
+        tmpdir=tempfile.mkdtemp() # create tempdir
+        ret=None
+        
+        for name in zf.namelist():
+               fn=tempfile.mkstemp()[1]
+               tf=file(fn,"w")
+               x=zf.read(name)
+               tf.write(x)
+               tf.close()
+               try:
+                   self._importObjectFromFile(fn,set_owner=1)
+               except:
+                   if not ret:
+                       ret=""
+                   ret+="Cannot import: %s (Already existing?)<br>"%name
+               os.remove(fn)
+        
+        if ret:
+            return """<html><body>%s</body></html>"""%ret
+        if RESPONSE:
+            RESPONSE.redirect(self.absolute_url())
+        
+    def exportObjects_html(self,RESPONSE):
+        """Export objects"""
+        
+        pt=zptFile(self, 'zpt/exportObjects.zpt')
+        pt.content_type="text/html"
+        return pt()
+    
+    def exportObjects(self,ids,RESPONSE=None):
+        """export objects with type id"""
+        if not (type(ids) is ListType):
+            ids=[ids]
+        
+        tmpdir=tempfile.mkdtemp() # create tempdir
+        objs=self.ZopeFind(self,obj_ids=ids)
+        tmpfile=tempfile.mkstemp()[1]
+
+        zf=zipfile.ZipFile(tmpfile,"w")
+        for obj in objs:
+
+            f = os.path.join(tmpdir, '%s.zexp' %obj[0])
+            #print E.absolute_url()
+
+            obj[1]._p_jar.exportFile(obj[1]._p_oid, f)
+
+            zf.write(f,obj[0])
+        
+        zf.close()
+        shutil.rmtree(tmpdir)
+        if RESPONSE:
+            RESPONSE.setHeader("Content-Type","application/octet-stream")
+            len=os.stat(tmpfile)[6]
+            RESPONSE.setHeader("Content-Length",len)
+            RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%"export.zip")
+            fh=file(tmpfile)
+            for x in fh.read():
+                RESPONSE.write(x)
+            fh.close()
+            
+    def getMDValueSimpleSearchField(self):
+          """returns value for simple search"""
+          return " ".join([self.title,self.description])
+                             
     def getTitleAndLabel(self):
         """gibt title und label zurueck"""
         return (getattr(self,'title',''),getattr(self,'label',''))
@@ -1673,16 +2188,16 @@ class ECHO_collection(Folder, Persistent
 
                             if obj.meta_type=="ECHO_mapText":
                                     if splitted[1]=="en":
-                                            obj.locale_en.pt_edit(REQUEST.form[key],None)
+                                            obj.locale_en.pt_edit(REQUEST.form[key],obj.locale_en.content_type)
                                     else:
-                                            obj.pt_edit(REQUEST.form[key],None)
+                                            obj.pt_edit(REQUEST.form[key],obj.content_type)
                             else:
                                     text=obj.ZopeFind(obj,obj_metatypes=['ECHO_mapText'])
                                     if splitted[1]=="en":
                                             
-                                            text[0][1].locale_en.pt_edit(REQUEST.form[key],None)
+                                            text[0][1].locale_en.pt_edit(REQUEST.form[key],text[0][1].locale_en.content_type)
                                     else:
-                                            text[0][1].pt_edit(REQUEST.form[key],None)
+                                            text[0][1].pt_edit(REQUEST.form[key],text[0][1].content_type)
             if RESPONSE is not None:
                         RESPONSE.redirect('manage_main')
 
@@ -1734,6 +2249,15 @@ class ECHO_collection(Folder, Persistent
                 pt=zptFile(self, 'zpt/changeMetaDataLinkForm')
                 pt.content_type="text/html"
                 return pt()
+            
+    def changeAccessRightsCollectionForm(self,preselect=None):
+        """change access rights of all resources in this collection"""
+
+        pt=zptFile(self, 'zpt/changeAccessRightsCollectionForm')
+        pt.content_type="text/html"
+        return pt(preselect=preselect)
+        
+        
     def changeAccessRightsCollection(self):
             """change"""
             ret=""
@@ -1742,11 +2266,15 @@ class ECHO_collection(Folder, Persistent
             resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
             for resource in resources:
                    
-                    try:
-                            ret+=resource[1].getId()+"   "+argv[resource[1].getId()]+"</br>"
-                            resource[1].changeAccessRightMD(argv[resource[1].getId()])
-                    except:
-                            pass
+                    if argv.has_key(resource[1].getId()+'_xml'):
+                            ret+=resource[1].getId()+"   "+argv[resource[1].getId()+'_xml']+"</br>"
+                            resource[1].setAccessRightXML(argv[resource[1].getId()+'_xml'])
+                            resource[1].accessRight=argv[resource[1].getId()+'_xml']
+                    elif argv.has_key(resource[1].getId()+'_echo'):
+                            ret+="only local:"+resource[1].getId()+"   "+argv[resource[1].getId()+'_echo']+"</br>"
+                            resource[1].accessRight=argv[resource[1].getId()+'_echo']
+                    else:
+                            ret+="ERROR:" +resource[0]
             return ret
 
     def changeMetaDataLinkInCollection(self):
@@ -1894,6 +2422,28 @@ class ECHO_collection(Folder, Persistent
         else:
             return None
 
+    def changeViewer(self,newViewer,REQUEST=None,RESPONSE=None):
+        """changes all ressources to the newViewer"""
+        
+        resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
+        if RESPONSE is not None:
+                    RESPONSE.write("<html><body>")
+
+        for resource in resources:
+            
+            done,msg=resource[1].changeViewer(newViewer)
+            if done:
+                if RESPONSE is not None:
+                    RESPONSE.write("<p>OK: %s"%resource[0])
+            else:
+                if RESPONSE is not None:
+                    RESPONSE.write("<p><a href='%s'>ERROR: %s (%s)</a>"%(resource[1].absolute_url()+'/ECHO_resource_config_main',resource[0],msg))
+                
+
+                
+        if RESPONSE is not None:
+                    RESPONSE.write("<p>Done</p></body></html>")
+
     def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix,RESPONSE=None):
             """change the templates"""
 
@@ -1943,7 +2493,7 @@ class ECHO_collection(Folder, Persistent
                     if ret and RESPONSE:
                             RESPONSE.write("ok: %s\n"%txt)
                     
-                    #zLOG.LOG("ECHO (copyTitleToInfoXMLFolder)",zLOG.INFO,txt)   
+                    #logger("ECHO (copyTitleToInfoXMLFolder)",logging.INFO,txt)   
             if RESPONSE is not None:
                     RESPONSE.write("done!\n")
                     RESPONSE.close()
@@ -1991,11 +2541,13 @@ class ECHO_collection(Folder, Persistent
                  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
@@ -2019,12 +2571,13 @@ class ECHO_collection(Folder, Persistent
             for resource in dom.getElementsByTagName('resource'):
                     link=getText(resource.getElementsByTagName('link')[0].childNodes)
                     label=getText(resource.getElementsByTagName('label')[0].childNodes)
+                    pageimglink=getText(resource.getElementsByTagName('pageimglink')[0].childNodes)
                     #splitted=link.split("?")[0].split("/")
                     #id=splitted[len(splitted)-1].encode('ascii')
                     id=re.sub(" ","_",label).encode('ascii')
                     
                     ret+="<p>"+label+"</p>"
-                    manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
+                    manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","",pageimglink.encode('ascii'),link.encode('ascii'),"","")
             return ret
         
     security.declarePublic('getImageTag')
@@ -2058,8 +2611,24 @@ class ECHO_collection(Folder, Persistent
             manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None)
             return "done"
         except:
-            return None
+        	logging.error("ECHOcollection: (AddResource): %s %s"%sys.exc_info()[0:2])
+        	return None
 
+    def addResourceAndCreateLabelAndTitle(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
+        """SSS"""
+        ret = self.addResource(id,title,label,description,contentType,responsible,link,metalink,weight,credits,coords,RESPONSE)
+        if ret is None:
+        	return None
+        
+        try:
+        	server2=getattr(self,id)
+        	server2.copyIndex_meta2echo_resource()
+        	server2.generate_label()
+        	server2.generate_title()
+    	except:
+	    	  logging.error("An Error occured adding the resource A\n %s %s"%sys.exc_info()[0:2])
+	    	  return None
+        return "done"
     def getSecondaryLink(self):
         """secondary link"""
         try:
@@ -2101,19 +2670,24 @@ class ECHO_collection(Folder, Persistent
         ret="""<?xml version="1.0" encoding="utf-8" ?>"""
         return ret+"<collection>"+getCollection(self,pwstr=pwstr)+"</collection>"
     
-    def createAllJSAreas(self):
+    def createAllJSAreas(self,mapColTypes=None):
         """create area calls for JavaScript"""
-        areas = self.getAllMapAreas()
+        areas = self.getAllMapAreas(mapColTypes=mapColTypes)
         return self.createJSAreas(areas)
 
+    
+    emptyPartner=ECHO_partner("", "","", "", "", "", "", "", "")
+    
     security.declarePublic('getCreditObject')
     def getCreditObject(self,name):
         """credit id to credititem"""
         try:
             return getattr(self.partners,name)
         except:
-            return ""
-
+            
+            return self.emptyPartner
+                
+    
     security.declarePublic('ECHO_generateNavBar')
     def ECHO_generateNavBar(self):
         """Erzeuge Navigationsbar"""
@@ -2148,7 +2722,7 @@ class ECHO_collection(Folder, Persistent
         return ECHO_rerenderLinksMD(self,obj,types)
 
         
-    def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour=""):
+    def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour="",isVisible=True):
 
         self.id = id
         """Festlegen der ID"""
@@ -2166,6 +2740,7 @@ class ECHO_collection(Folder, Persistent
         self.secondaryLinkTitle=secondaryLinkTitle
         self.secondaryLink=secondaryLink
         self.bgcolour=bgcolour
+        self.isVisible=isVisible
         
 
     manage_options = Folder.manage_options+ Cacheable.manage_options+(
@@ -2175,6 +2750,7 @@ class ECHO_collection(Folder, Persistent
         {'label':'Localize','action':'localizeObjects'},
         {'label':'Change Weights','action':'changeWeights'},
         {'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMDWarning'},
+        {'label':'Export/Import Objects','action':'exportImportObjects_html'},
         {'label':'Graphic Coords','action':'ECHO_graphicEntry'},
         {'label':'create resources from XML','action':'createRessourcesFromXMLForm'},
         {'label':'Set Startpage','action':'setStartpageFolderForm'},
@@ -2182,6 +2758,7 @@ class ECHO_collection(Folder, Persistent
         {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
         {'label':'ImportCollection','action':'importCollection'},
         {'label':'Copy MD for indexing and search','action':'copySearchFields'},
+        {'label':'Change access rights',  'action':'changeAccessRightsCollectionForm'},
         )
 
     
@@ -2208,7 +2785,7 @@ class ECHO_collection(Folder, Persistent
 
                 
     security.declarePublic('changeECHO_collection')         
-    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix=""):
+    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix="",isVisible=True):
         """Aenderung der Properties"""
 
         self.secondaryLink=secondaryLink
@@ -2219,6 +2796,7 @@ class ECHO_collection(Folder, Persistent
         self.isAlwaysClickable=isAlwaysClickable
         self.prefix=prefix[0:]
         self.suffix=suffix[0:]
+        self.setIsVisible(isVisible)
         
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
                 
@@ -2278,15 +2856,11 @@ class ECHO_collection(Folder, Persistent
         #print "NN",argv
         ret = ECHO_basis.content_html(self,'collection')
         
-        try:
-                return ret.encode('utf-8')
-        except:
-            
-            try: 
-                return ret.decode('latin-1')
-            except:
-                
-                return ret
+        if type(ret) is StringType:
+               return ret.decode('utf-8')
+        else:
+               return ret
+        
              
     def getCredits(self):
         """Ausgabe der credits"""
@@ -2323,9 +2897,11 @@ class ECHO_collection(Folder, Persistent
         """javascript"""
         return sendFile(self, 'js/hl_add.js', 'text/plain')
 
-    def getAllMapAreas(self,mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink']):
+    def getAllMapAreas(self,mapColTypes=None):
         """Give list of coordinates"""
-        
+        if mapColTypes is None:
+            mapColTypes=['ECHO_collection','ECHO_resource','ECHO_link','ECHO_externalLink']
+            
         areas=[]
         for entry in self.getSubCols(subColTypes=mapColTypes):
             object=entry
@@ -2345,7 +2921,13 @@ class ECHO_collection(Folder, Persistent
 
 
     getSubCols = ECHO_helpers.getSubCols
-
+    
+    def getSubcolsXMLRpc(self,searchSimple):
+        """simplesearch results suitable for xml rpc, gives back array objid,url"""
+        
+        return [x.absolute_url() for x in self.getSubCols(searchSimple=searchSimple)]
+    
+    
 Globals.InitializeClass(ECHO_collection)
     
 def manage_addECHO_collectionForm(self):
@@ -2354,11 +2936,11 @@ def manage_addECHO_collectionForm(self):
         return pt()
 
 
-def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
+def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour="",isVisible=True):
     """add a echo collection"""
     
 
-    newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="")
+    newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="",isVisible=isVisible)
 
     self._setObject(id,newObj)
 
@@ -2643,7 +3225,40 @@ class ECHO_root(Folder,Persistent,Implic
     security=ClassSecurityInfo()
     
     meta_type="ECHO_root"
-        
+    management_page_charset="utf-8"
+    
+    getSubCols = ECHO_helpers.getSubCols
+
+    manage_options=Folder.manage_options+(
+                {'label':'Main Config','action':'ECHO_copyright_configForm'},
+                {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
+                {'label':'Change Weights','action':'changeWeights'},
+                {'label':'Generate from RDF','action':'generateFromRDFForm'},
+                {'label':'update Resource Catalog','action':'updateResourceCatalog'},
+                {'label':'Copy MD for indexing and search','action':'copySearchFields'},
+)
+
+
+    def getECHORootURL(self):
+        return self.absolute_url()
+    
+    def getECHORoot(self):
+        return self
+    
+    def copySearchFields(self,RESPONSE=None):
+            """copys < metadatafields to the object"""
+            resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
+
+            for resource in resources:
+
+                    resource[1].copySearchFields()
+
+            if RESPONSE is not None:
+                    RESPONSE.redirect('manage_main')
+   
+    def mod_re_sub(self,pattern,replace,string):
+        """re.sub aus mod re zur Verfuegung stellen"""
+        return re.sub(pattern,replace,string)
     
     def findObjectFromFulltext(self,existUri):
         '''
@@ -2672,26 +3287,13 @@ class ECHO_root(Folder,Persistent,Implic
         
         for resource in resources:
             resource[1].reindex()
-            print "<p> done %s </p>\n"
+            #print "<p> done %s </p>\n"
             if RESPONSE:
                 RESPONSE.write("<p> done %s </p>\n"%resource[0])
                 
         if RESPONSE:
             RESPONSE.write("<p> ok </p></html></body>\n")
             
-    def printer(self,txt):
-        print txt
-        print txt[2]
-        print txt[2].getImageTag()
-        print "HO"
-        return txt[2].getImageTag()
-
-    def printer2(self,txt):
-        print txt
-
-
-    def item2(self,txt):
-        return txt[2]
 
     def setLanguage(self,lang):
             """Set language cookie"""
@@ -2706,6 +3308,7 @@ class ECHO_root(Folder,Persistent,Implic
             
             self.REQUEST.RESPONSE.setCookie('lang_exhibition',lang,path="/")
             self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1'])
+            
     def getLanguage(self):
             """get language cookie"""
             lang= self.REQUEST.cookies.get('lang_exhibition','de')
@@ -2895,17 +3498,7 @@ class ECHO_root(Folder,Persistent,Implic
                 pt=zptFile(self, 'zpt/changeWeightForm')
                 pt.content_type="text/html"
                 return pt()
-    getSubCols = ECHO_helpers.getSubCols
-
-    manage_options=Folder.manage_options+(
-                {'label':'Main Config','action':'ECHO_copyright_configForm'},
-                {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
-                {'label':'Change Weights','action':'changeWeights'},
-                {'label':'Generate from RDF','action':'generateFromRDFForm'},
-
-)
-
-    
+  
 
     def reloadMetaDataFromStorageWarning(self,RESPONSE=None):
             """warning"""
@@ -2961,11 +3554,13 @@ class ECHO_root(Folder,Persistent,Implic
             return ret
 
     def getValueFromClass(self,field,found):
-            """retattribute falss existing"""
+            """ret attribute if existing"""
             try:
                     
-                    return getattr(found,field).decode('ascii','ignore')
+                    return getattr(found,field)#.decode('utf-8','ignore')
             except:
+                    logging.error("can't: decode: %s"%repr(field))
+                    logging.error("      %s %s"%(sys.exc_info()[0],sys.exc_info()[1]))
                     return ""
 
     security.declarePublic('getImageTag')
@@ -3202,7 +3797,10 @@ class ECHO_root(Folder,Persistent,Implic
 
     def formatAscii(self,str,url=None):
         """ersetze ascii umbrueche durch <br>"""
-        #url=None
+
+	if not str: 
+            return ""
+
         if url:
             
             retStr=""
@@ -3214,11 +3812,13 @@ class ECHO_root(Folder,Persistent,Implic
                 retStr+="""<a href="%s">%s</a><br/>"""%(strUrl,word)
             str=retStr
         if str:
-            return re.sub(r"[\n]","<br/>",str)
+            str = re.sub(r"[\n]","<br/>",str)
+            return unicodify(str)
         else:
-            return ""
+            return u""
         
     link2html=vlp_xmlhelpers.link2html
+    related2html=vlp_xmlhelpers.related2html
 
     xml2html=vlp_xmlhelpers.xml2html
  
@@ -3251,7 +3851,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 []
   
@@ -3349,6 +3952,20 @@ class ECHO_root(Folder,Persistent,Implic
             self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
             self.REQUEST.RESPONSE.write(ret)
 
+    def getCollectionsXML(self,viewerType=None,filter=None):
+            """gebe collections aus"""
+            ret="""<?xml version="1.0" ?>
+                     <index>"""
+            for resource in self.ZopeFind(self,obj_metatypes=['ECHO_collection','ECHO_group'],search_sub=1):
+
+                    echo_url=resource[1].absolute_url()
+                 
+                    ret+="""\n<collection echoLink="%s"/>"""%urllib.quote(echo_url,safe='/:?')
+            ret +="""\n</index>"""
+            
+            self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
+            self.REQUEST.RESPONSE.write(ret)
+
     def getFullTextsXML(self,viewerType=None,filter=None):
             """gebe all ressourcen aus"""
             ret="""<?xml version="1.0" ?>
@@ -3434,7 +4051,46 @@ class ECHO_root(Folder,Persistent,Implic
         inst=self.ZopeFind(self.institutions, obj_ids=[id])
         return inst
 
+    def updateResourceCatalog(self,REQUEST,RESPONSE):
+        """update ressource catalog"""
+        catalog=getattr(self,'resourceCatalog',None)
+        if not catalog:
+            return """<html><body><h3>No resourceCatalog available</h3></body></html>"""
         
+        else:
+            class element:
+                def __init__(self,group,name):
+                    self.group=group
+                    self.name=name
+            catalog.manage_delObjects('author splitter')
+            #elements=[element('Stop Words',""" Don't remove stop words' """),element('Word Splitter','ECHO author splitter')]
+            elements=[element('Word Splitter','ECHO author splitter')]
+            manage_addLexicon(catalog,id="author splitter",elements=elements)
+            
+            return catalog.manage_catalogReindex(REQUEST,RESPONSE,'manage_main')
+            
+        
+    def checkMetaDataLinks(self,correct=None):
+        """check all metadatalinks and if correct is set change the servername to content.mpiwg-berlin.mpg.de"""
+        
+        self.REQUEST.RESPONSE.write("<html><body>")
+        for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):
+            metalink=resource[1].metalink
+        
+            try:
+                url=urllib.urlopen(metalink)
+            except:
+                
+                self.REQUEST.RESPONSE.write("<p>ERROR (opening %s):"%resource[1].absolute_url() +" -- %s %s <br>"%sys.exc_info()[0:2])
+                self.REQUEST.RESPONSE.write("-----------%s"%metalink)
+            
+                if correct:
+                    urlparsed=[x for x in urlparse.urlparse(metalink)]
+                    urlparsed[1]="content.mpiwg-berlin.mpg.de"
+                    neu=urlparse.urlunparse(urlparsed)
+                    resource[1].metalink=neu[0:]
+                    self.REQUEST.RESPONSE.write("----------changed to:%s)"%neu)
+                                
 def manage_addECHO_root(self,id,title,RESPONSE=None):
     """Add an ECHO_root"""
     self._setObject(id,ECHO_root(id,title))
@@ -3496,89 +4152,6 @@ def manage_addECHO_copyrightType(self,id
  
 
  
-class ECHO_partner(Image,Persistent,ECHO_basis):
-    """ECHO Partner"""
-
-    meta_type="ECHO_partner"
-
-    def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''):
-        self.__name__=id
-        self.title=title
-        self.url=url
-        self.person=person
-        self.email=email
-        self.country=country
-        self.color=color
-        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)
-
-    manage_options = Image.manage_options+(
-        {'label':'Partner Information','action':'ECHO_partner_config'},
-        )
-
-    
-    def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None):
-        """Change main information"""
-        self.url=url
-        self.person=person
-        self.email=email
-        self.country=country
-        self.color=color
-        self.copyrightType=copyrightType
-        if RESPONSE is not None:
-            RESPONSE.redirect('manage_main')
-            
-            
-
-    def ECHO_partner_config(self):
-        """Main configuration"""
-        if not hasattr(self,'url'):
-            self.url=""
-        pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt')
-        return pt()
-
-        
-manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(),
-                             Kind='ECHO_partner',kind='ECHO_partner')
-
-
-
-def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='',
-                    REQUEST=None):
-    """
-    Add a new ECHO_partner object.
-
-    Creates a new ECHO_partner object 'id' with the contents of 'file'.
-    Based on Image.manage_addImage
-    """
-
-    id=str(id)
-    title=str(title)
-    content_type=str(content_type)
-    precondition=str(precondition)
-
-    id, title = OFS.Image.cookId(id, title, file)
-
-    self=self.this()
-
-    # First, we create the image without data:
-    self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, 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.
-    if file:
-        self._getOb(id).manage_upload(file)
-    if content_type:
-        self._getOb(id).content_type=content_type
-
-    if REQUEST is not None:
-        try:    url=self.DestinationURL()
-        except: url=REQUEST['URL1']
-        REQUEST.RESPONSE.redirect('%s/manage_main' % url)
-    return id
 
 class ECHO_linkList(ZopePageTemplate,ECHO_basis):
     """LinkList Objekt"""
@@ -3616,7 +4189,7 @@ class ECHO_linkList(ZopePageTemplate,ECH
     def getcontentType(self):
         """get contentType"""
         if hasattr(self,'contentType'):
-            return self.contentType
+            return normalizeCt(self.contentType)
         else:
             return 0
 
@@ -3627,6 +4200,8 @@ class ECHO_linkList(ZopePageTemplate,ECH
          self.ZBindings_edit(self._default_bindings)
          if text is None:
              text = ''
+         if content_type is None:
+             content_type = self.content_type
          self.pt_edit(text, contentType)
 
 
@@ -3727,6 +4302,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"""
@@ -3847,3 +4535,48 @@ def repairCoords(self):
                     col.addMapArea(area)
         msg += "\nDone!"
         return msg
+
+from ECHO_Nav import ECHO_navigation
+
+class ECHO_main(ECHO_root,ECHO_navigation):
+    """echo main object combines ECHO_root and ECHO_navigation"""
+    
+    meta_type="ECHO_main"
+    
+    def __init__(self,id,title):
+        """init"""
+        self.id=id
+        self.title=title
+        self.pathToHierarchy="/"+self.id # hierarchie always starts with the object.
+        self.displayedMetaTypes=displayTypes
+        
+        
+    manage_options = Folder.manage_options+(
+        {'label':'Main Config','action':'ECHO_navigationConfigForm'},
+        {'label':'Cache','action':'ECHO_cacheManageForm'},
+        {'label':'Main Config','action':'ECHO_copyright_configForm'},
+        {'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
+        {'label':'Change Weights','action':'changeWeights'},
+        {'label':'Generate from RDF','action':'generateFromRDFForm'},
+        {'label':'update Resource Catalog','action':'updateResourceCatalog'},
+        {'label':'Copy MD for indexing and search','action':'copySearchFields'},
+        )
+
+    
+def manage_addECHO_mainForm(self):
+    """Form for adding"""
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_main.zpt')).__of__(self)
+    return pt()
+
+def manage_addECHO_main(self,id,title,RESPONSE=None):
+    """Add an ECHO_main"""
+    self._setObject(id,ECHO_main(id,title))
+    
+    obj=self._getOb(id)
+    text=file(os.path.join(package_home(globals()),'zpt','main_template')).read()
+    
+    manage_addPageTemplate(obj,'main_template',text=text)               
+    
+  
+    if RESPONSE is not None:
+        RESPONSE.redirect('manage_main')