--- ECHO_content/ECHO_collection.py	2007/01/23 18:53:01	1.282
+++ ECHO_content/ECHO_collection.py	2007/01/31 13:43:36	1.283
@@ -1300,9 +1300,9 @@ class ECHO_resource(CatalogAware,Folder,
             """returns value for simple search"""
             
             try:
-                return " ".join([self.getMDValue('title',generic="yes",empty=" "),
-                             self.getMDValue('author',generic="yes",empty=" "),
-                             self.getMDValue('year',generic="yes",empty=" "),self.getTitle()])
+                return " ".join([self.getMDValue('title',generic="yes"),
+                             self.getMDValue('author',generic="yes"),
+                             self.getMDValue('year',generic="yes"),self.getTitle()])
             except:
                 
                 #zLOG.LOG(" ECHO_collection(getMDSimpleSearchField)",zLOG.INFO," ".join([self.getMDValue('title',generic="yes"),
@@ -1342,7 +1342,7 @@ class ECHO_resource(CatalogAware,Folder,
                     self._v_mapHash[ct][fieldNameTest]=fieldName
             if not fieldName:
                 fieldName=fieldNameTest  
-            if empty is None:
+            if not empty:
                            #FIXME: warum gibt es manchmal kein metadatahas
                 try:
                     
@@ -1352,13 +1352,10 @@ class ECHO_resource(CatalogAware,Folder,
                     return ""
                   
             else:
-                try:
+
                    
                    ret= self.metaDataHash.get(fieldNameTest,empty)
-                except:
-                    zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) 
-                    return ""
-                
+           
             if type(ret) is StringType:
                return ret.decode('utf-8')
             else:
@@ -1755,7 +1752,7 @@ class ECHO_externalLink(Folder,ECHO_basi
         
         
     
-    def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
+    def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType):
 
         self.id = id
         """Festlegen der ID"""
@@ -1770,6 +1767,8 @@ class ECHO_externalLink(Folder,ECHO_basi
         self.responsible=responsible
         coordsnew=[ string.split(x,",") for x in coords]
         self.coords=coordsnew
+	self.linkType = linkType 	# Linktypen 'otherPresentation','external'
+	
 
     def ECHO_externalLink_config(self):
         """Main configuration"""
@@ -1785,13 +1784,25 @@ class ECHO_externalLink(Folder,ECHO_basi
         return pt()
     
 
-    def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
+    def changeECHO_externalLink(self,link,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None,linkType='otherPresentation'):
         """Aenderung der Properties"""
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
 
         self.link=link
+	self.linkType = linkType
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
+	    
+    def getLinkType(self):
+        """ return linkType """
+        if hasattr(self,"linkType"):
+		return self.linkType
+	else :
+		return 'otherPresentation'
+
+    def setLinkType(self,type):
+        """ set linkType """
+        self.linkType = type
             
             
     manage_options = Folder.manage_options+(
@@ -1804,6 +1815,7 @@ class ECHO_externalLink(Folder,ECHO_basi
         """standard page"""
         
         return self.REQUEST.RESPONSE.redirect(self.link)
+	    
 
 def manage_addECHO_externalLinkForm(self):
         """Form for external Links"""
@@ -1811,10 +1823,10 @@ def manage_addECHO_externalLinkForm(self
         return pt()
 
 
-def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None):
+def manage_addECHO_externalLink(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None,linkType='otherPresentation'):
     """Add an external Link"""
 
-    newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords)
+    newObj=ECHO_externalLink(id,link,title,label,description,contentType,responsible,credits,weight,coords,linkType)
 
     self._setObject(id,newObj)
 
@@ -2653,7 +2665,7 @@ class ECHO_collection(CatalogAware, Fold
         self.secondaryLinkTitle=secondaryLinkTitle
         self.secondaryLink=secondaryLink
         self.bgcolour=bgcolour
-        self.isVisible=isVisible
+	self.isVisible=isVisible
         
 
     manage_options = Folder.manage_options+ Cacheable.manage_options+(
@@ -2709,7 +2721,7 @@ class ECHO_collection(CatalogAware, Fold
         self.isAlwaysClickable=isAlwaysClickable
         self.prefix=prefix[0:]
         self.suffix=suffix[0:]
-        self.setIsVisible(isVisible)
+	self.setIsVisible(isVisible)
         
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)