--- ECHO_content/ECHO_collection.py	2004/05/28 11:06:32	1.94
+++ ECHO_content/ECHO_collection.py	2004/05/28 15:01:43	1.95
@@ -243,6 +243,7 @@ def readMetadata(url):
         
         for node in metacontent:
             try:
+		    #print urllib.unquote(getText(node.childNodes)),getText(node.childNodes)
 		    metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
             except:
                 """nothing"""
@@ -452,7 +453,7 @@ class ECHO_resource(Folder,Persistent):
 	    label=obj.label
 	    link="copyrightTypes/"+obj.getId()+'/copyright.html'
 	    
-	    return """<a target="_blank" href="%s">c%s</a>"""%(link,label)
+	    return """<a target="_blank" href="%s">%s</a>"""%(link,label)
     
     def getCredits(self):
         """Ausgabe der credits"""
@@ -671,7 +672,7 @@ class ECHO_resource(Folder,Persistent):
             
     manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_resource_config_main'},
-	{'label':'Change Credits & Copyright','action':'ECHO_resource_config_credits'},
+	{'label':'Change Partners & Copyright','action':'ECHO_resource_config_credits'},
 	{'label':'Change Metadata','action':'ECHO_resource_config_metadata'},
 	{'label':'Change Coords','action':'ECHO_resource_config_coords'},
 	{'label':'Add coords','action':'ECHO_graphicEntry'},
@@ -838,16 +839,19 @@ class ECHO_resource(Folder,Persistent):
 
     def copyIndex_meta2echo_resource(self,RESPONSE=None):
 	    """copy MD von Index_meta to the echo_resource"""
-
+	    
 	    (metadict, error)=readMetadata(self.metalink)
 	    
 	    self.metaDataHash={}
 	    if not error=="": #Fehler beim Auslesen des Metafiles
 		    return "ERROR:",error
 	    fields=self.findTagsFromMapping(self.contentType)
+	    
 	    #fields=self.findLabelsFromMapping(self.contentType)
 	    for field in fields[1]:
+		    
 		    if self.isDefinedInThisSet(fields,field):
+			    #print urllib.unquote(metadict.get(self.getFieldTag(fields,field),''))
 			    self.setFieldValue(self.getFieldTag(fields,field),metadict.get(self.getFieldTag(fields,field),''))
 
 	    
@@ -1790,14 +1794,17 @@ class ECHO_root(Folder,Persistent,Implic
 	    if not content or content=="":
 		    return ""
 	    ret="<%s>"%tag
-	    ret+=urllib.quote(content)
+	    #ret+=urllib.quote(content)
+	    ret+=content
+
 	    ret+="</%s>"%tag
 	    return ret
 
     def getValueFromClass(self,field,found):
 	    """retattribute falss existing"""
 	    try:
-		    return getattr(found,field)
+		    
+		    return getattr(found,field).decode('ascii','ignore')
 	    except:
 		    return ""