--- ECHO_content/ECHO_collection.py	2005/12/13 12:45:21	1.260
+++ ECHO_content/ECHO_collection.py	2006/02/14 19:29:45	1.263
@@ -852,9 +852,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 +865,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')
@@ -1189,6 +1184,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 +1245,7 @@ class ECHO_resource(CatalogAware,Folder,
                     return ""
                   
             else:
+
                    
                    ret= self.metaDataHash.get(fieldNameTest,empty)
            
@@ -1256,7 +1253,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):
@@ -1513,8 +1510,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')