--- ECHO_content/ECHO_collection.py	2005/10/26 11:18:19	1.239
+++ ECHO_content/ECHO_collection.py	2005/10/28 13:25:01	1.244
@@ -946,8 +946,7 @@ class ECHO_resource(CatalogAware,Folder,
                 self.contentType=self.bib_type
                 for data in self.metadata:
                         data_neu=re.sub('-','_',data)
-                        self.meta
-                        DataHash[data_neu]=getattr(self,data)[0:]
+                        self.metaDataHash[data_neu]=getattr(self,data)[0:]
 
         
         pt=zptFile(self, 'zpt/ChangeECHO_resource_metadata.zpt')
@@ -1499,15 +1498,35 @@ class ECHO_link(ECHO_externalLink):
         """external_link"""
 
         meta_type="ECHO_link"
+	manage_options = ECHO_externalLink.manage_options+(
+        	{'label':'add links config','action':'ECHO_link_addLinksForm'},
+                )
         
+        def ECHO_link_addLinksForm(self):
+            """Main configuration"""
         
+            pt=zptFile(self, 'zpt/ChangeECHO_link_addLinks.zpt')
+            return pt()
+    
+        def ECHO_link_addLinks(self,addLinks,RESPONSE):
+            """add links"""
+            self.addLinks=addLinks
+            if RESPONSE is not None:
+                RESPONSE.redirect('manage_main')
+  
         def content_html(self):
                 """template fuer link"""
+                
                 if hasattr(self,"link_template"):
-                        return ECHO_basis.content_html(self,'link')
+                        ret=ECHO_basis.content_html(self,'link')
                 else:
-                        return ECHO_basis.content_html(self,'collection')
+                        ret=ECHO_basis.content_html(self,'collection')
 
+                try:
+                    return ret.decode('utf-8')
+                except:
+                    return ret
+                
         def index_html(self):
                 """standard link"""
                 if self.link:
@@ -1523,8 +1542,9 @@ class ECHO_link(ECHO_externalLink):
                  else:
                         params={}
                 
-                 params['backLink']=self.aq_parent.absolute_url()
-                 params['startLink']=splitted[0]+"?"+urllib.urlencode(params)
+                 if getattr(self,'addLinks','yes')=="yes":
+                     params['backLink']=self.aq_parent.absolute_url()
+                     params['startLink']=splitted[0]+"?"+urllib.urlencode(params)
                 
                 
                  return self.REQUEST.RESPONSE.redirect(splitted[0]+"?"+urllib.urlencode(params))
@@ -1543,7 +1563,9 @@ def manage_addECHO_link(self,id,title,la
     newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)
 
     self._setObject(id,newObj)
-
+    
+    getattr(self,id).addLinks='no'
+    
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
         
@@ -2217,8 +2239,18 @@ class ECHO_collection(Folder, Persistent
     def content_html(self,**argv):
         """template fuer content"""
         #print "NN",argv
-        return ECHO_basis.content_html(self,'collection')
-    
+        ret = ECHO_basis.content_html(self,'collection')
+        
+        try:
+                return ret.encode('utf-8')
+        except:
+            
+            try: 
+                return ret.decode('latin-1')
+            except:
+                
+                return ret
+             
     def getCredits(self):
         """Ausgabe der credits"""
         if self.credits: