--- ECHO_content/ECHO_collection.py	2004/06/22 14:51:19	1.126
+++ ECHO_content/ECHO_collection.py	2004/06/24 12:23:05	1.129
@@ -510,6 +510,9 @@ class ECHO_resource(Folder,Persistent):
 	    
 	    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
 
@@ -551,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)
 
@@ -561,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')
@@ -613,7 +622,7 @@ class ECHO_resource(Folder,Persistent):
 			    return "<error>no fulltext available</error>"
 
     def getCopyrightsHTML(self):
-	    """gib (link auf copyright notiz, mediatyp, institution, copyrightType, label von copyrightType) aus"""
+	    """gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""
 	    
 	    if hasattr(self,'copyrightModel'):
 		    obj=self.copyrightModel
@@ -632,12 +641,12 @@ class ECHO_resource(Folder,Persistent):
 		        url=copyrightTypeObj.url
 			    
 		        if url!='':
-			         ret.append(("""<a target="_blank" href="%s">%s</a>"""%(url,label),copyright[0],copyright[1],copyright[2],label))
+			         ret.append((url,copyright[0],copyright[1],copyright[2],label))
 		        else:
 			        if hasattr(copyrightTypeObj, 'copyright.html'):
-			             ret.append(("""<a target="_blank" href="%s?partner=%s">%s</a>"""%(link,copyright[1],label),copyright[0],copyright[1],copyright[2],label))
+			             ret.append(("""%s?partner=%s"""%(link,copyright[1]),copyright[0],copyright[1],copyright[2],label))
 			        else:
-			             ret.append((label,copyright[0],copyright[1],copyright[2],label))
+			             ret.append(('empty',copyright[0],copyright[1],copyright[2],label))
 		    except:
 			    """nothing"""