--- ECHO_content/ECHO_collection.py	2005/12/13 12:45:21	1.260
+++ ECHO_content/ECHO_collection.py	2006/07/27 15:27:34	1.272
@@ -34,10 +34,11 @@ 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 cgi
@@ -342,7 +343,7 @@ 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'))
+                dom=xml.dom.minidom.parseString(self())
                 pages=dom.getElementsByTagName('page')
                 
                 return pages[int(nr)-1].toxml()
@@ -823,6 +824,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"""
@@ -852,9 +858,11 @@ 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:	            
+            	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()
+	    except:
+                zLOG.LOG("ECHO_ressource (changeViewerTemplateSet)", zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])		
+                zLOG.LOG("ECHO_ressource (changeViewerTemplateSet)", zLOG.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
@@ -863,22 +871,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:
+                zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+                zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.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')
@@ -1014,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"""
@@ -1189,6 +1209,7 @@ class ECHO_resource(CatalogAware,Folder,
                     except:
                             zLOG.LOG("ECHO_collection (changeECHO_resource_metadata)",zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])
 
+            print self.newMetaXML()
             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()
 
 
@@ -1249,6 +1270,7 @@ class ECHO_resource(CatalogAware,Folder,
                     return ""
                   
             else:
+
                    
                    ret= self.metaDataHash.get(fieldNameTest,empty)
            
@@ -1256,7 +1278,7 @@ class ECHO_resource(CatalogAware,Folder,
                return ret.decode('utf-8')
             else:
                return ret
-           
+
     getFieldValue=getMDValue #depricated
 
     def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None):
@@ -1267,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):
@@ -1513,8 +1539,10 @@ class ECHO_resource(CatalogAware,Folder,
         
         
         
+
         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')
@@ -1748,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"""
@@ -2188,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
@@ -2850,6 +2944,29 @@ class ECHO_root(Folder,Persistent,Implic
     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 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)
@@ -2888,19 +3005,6 @@ class ECHO_root(Folder,Persistent,Implic
         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"""
@@ -2915,6 +3019,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')
@@ -3104,17 +3209,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"""
@@ -3460,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 []
   
@@ -3643,7 +3741,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))
@@ -3853,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"""
@@ -3973,3 +4223,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')