--- ECHO_content/ECHO_collection.py	2004/06/22 14:47:57	1.125
+++ ECHO_content/ECHO_collection.py	2004/06/23 14:14:29	1.128
@@ -505,12 +505,14 @@ class ECHO_resource(Folder,Persistent):
     
 	    params="startpage=%s"%startpage
 	    
-	    
 	    urllib.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()
-
-	    #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))
+	
+	    
 	    path=self.metalink
 	    
+	    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','',path) # falls foxridge als server
 
@@ -552,7 +554,7 @@ class ECHO_resource(Folder,Persistent):
 	    paramList=['project','startpage','xslt','thumbtemplate','topbar','digiLibTemplate']
 
 	    
-	    #print writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
+	    writeMetadata(self.metalink,self.metaDataHash,project,None,xslt,thumbtemplate,topbar,digiLibTemplate)
 
 	    params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate)
 
@@ -562,13 +564,19 @@ class ECHO_resource(Folder,Persistent):
 	    # hack Pfad auf die Dokumente
 	    path=self.metalink
 	    
-	    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('/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
+
 
-	    print urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+	    return urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
 
 	    if RESPONSE is not None:
 			RESPONSE.redirect('manage_main')
@@ -616,8 +624,8 @@ class ECHO_resource(Folder,Persistent):
     def getCopyrightsHTML(self):
 	    """gib (link auf copyright notiz, mediatyp, institution, copyrightType, label von copyrightType) aus"""
 	    
-	    if hasattr(self,'copyrightModell'):
-		    obj=self.copyrightModell
+	    if hasattr(self,'copyrightModel'):
+		    obj=self.copyrightModel
 		    
 	    else:
 		    return "ERROR"