--- ECHO_content/ECHO_collection.py	2007/01/15 11:13:04	1.280
+++ ECHO_content/ECHO_collection.py	2007/01/23 18:53:01	1.282
@@ -1300,9 +1300,9 @@ class ECHO_resource(CatalogAware,Folder,
             """returns value for simple search"""
             
             try:
-                return " ".join([self.getMDValue('title',generic="yes"),
-                             self.getMDValue('author',generic="yes"),
-                             self.getMDValue('year',generic="yes"),self.getTitle()])
+                return " ".join([self.getMDValue('title',generic="yes",empty=" "),
+                             self.getMDValue('author',generic="yes",empty=" "),
+                             self.getMDValue('year',generic="yes",empty=" "),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 not empty:
+            if empty is None:
                            #FIXME: warum gibt es manchmal kein metadatahas
                 try:
                     
@@ -1352,10 +1352,13 @@ 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:
@@ -2632,7 +2635,7 @@ class ECHO_collection(CatalogAware, Fold
         return ECHO_rerenderLinksMD(self,obj,types)
 
         
-    def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour=""):
+    def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour="",isVisible=True):
 
         self.id = id
         """Festlegen der ID"""
@@ -2650,6 +2653,7 @@ class ECHO_collection(CatalogAware, Fold
         self.secondaryLinkTitle=secondaryLinkTitle
         self.secondaryLink=secondaryLink
         self.bgcolour=bgcolour
+        self.isVisible=isVisible
         
 
     manage_options = Folder.manage_options+ Cacheable.manage_options+(
@@ -2694,7 +2698,7 @@ class ECHO_collection(CatalogAware, Fold
 
                 
     security.declarePublic('changeECHO_collection')         
-    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix=""):
+    def changeECHO_collection(self,title,label,description,contentType,responsible,weight,secondaryLink,secondaryLinkTitle,credits=None,sortfield="weight",coords=None,RESPONSE=None,imageTag="",bgcolour="",location=None,isAlwaysClickable=None,prefix="",suffix="",isVisible=True):
         """Aenderung der Properties"""
 
         self.secondaryLink=secondaryLink
@@ -2705,6 +2709,7 @@ class ECHO_collection(CatalogAware, Fold
         self.isAlwaysClickable=isAlwaysClickable
         self.prefix=prefix[0:]
         self.suffix=suffix[0:]
+        self.setIsVisible(isVisible)
         
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
                 
@@ -2842,11 +2847,11 @@ def manage_addECHO_collectionForm(self):
         return pt()
 
 
-def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour=""):
+def manage_addECHO_collection(self,id,title,label,description="",contentType="",responsible="",weight=0,sortfield="weight",coords="",secondaryLinkTitle="",secondaryLink="",credits=None,RESPONSE=None,imageTag="",bgcolour="",isVisible=True):
     """add a echo collection"""
     
 
-    newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="")
+    newObj=ECHO_collection(id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle=secondaryLinkTitle,secondaryLink=secondaryLink,imageTag=imageTag,bgcolour="",isVisible=isVisible)
 
     self._setObject(id,newObj)