--- ECHO_content/ECHO_helpers.py	2006/03/03 22:05:31	1.74
+++ ECHO_content/ECHO_helpers.py	2006/05/15 08:11:57	1.76
@@ -139,7 +139,11 @@ class ECHO_basis:
         
     def getTitle(self):
         """title"""
-        lang=self.getLanguage()
+        if hasattr(self,'getLanguage'):
+            lang=self.getLanguage()    
+        else:
+            lang=None
+
         locale=None
         if lang and not (lang =="de"):
                 locale=self.ZopeFind(self,obj_ids=["locale_"+lang])
@@ -147,13 +151,20 @@ class ECHO_basis:
         if locale:
                 return self.decode(locale[0][1].title)
         else:
+            try:
                 return self.decode(self.title)
-
+            except:    
+                return self.title
         
     def getLabel(self):
         """title"""
-        lang=self.getLanguage()
+        if hasattr(self,'getLanguage'):
+            lang=self.getLanguage()    
+        else:
+            lang=None
+
         locale=None
+                
         if lang and not (lang=="de"):
                 locale=self.ZopeFind(self,obj_ids=["locale_"+lang])
 
@@ -537,7 +548,7 @@ def checkOnlyOneInGroup(object):
         else:           return object
 
 
-def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchSimple=None,generic="yes",search_sub=0):
+def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchMD_modus='search',searchSimple=None,generic="yes",search_sub=0):
         
         def sort(x,y):
                 return cmp(x[0],y[0])
@@ -569,7 +580,11 @@ def getSubCols(self, sortfield=None, sub
                             for field in searchMD.keys():
                                     #if object.getMDValue(field,generic=generic)==searchMD[field]:
                                     #if re.match(searchMD[field],object.getMDValue(field,generic=generic)):
-                                    if object.getMDValue(field,generic=generic).find(searchMD[field])>-1:
+                                    if searchMD_modus=='match':
+                                        searchResult=re.match(searchMD[field],object.getMDValue(field,generic=generic))
+                                    else:
+                                        searchResult=re.search(searchMD[field],object.getMDValue(field,generic=generic))
+                                    if searchResult:
                                             flag=1
                                     else:
                                             flag=0