--- ECHO_content/ECHO_helpers.py	2006/02/03 17:59:41	1.70
+++ ECHO_content/ECHO_helpers.py	2006/03/03 22:05:31	1.74
@@ -568,8 +568,8 @@ def getSubCols(self, sortfield=None, sub
                             flag=0
                             for field in searchMD.keys():
                                     #if object.getMDValue(field,generic=generic)==searchMD[field]:
-                                    
-                                    if re.match(searchMD[field].decode('utf-8'),object.getMDValue(field,generic=generic)):
+                                    #if re.match(searchMD[field],object.getMDValue(field,generic=generic)):
+                                    if object.getMDValue(field,generic=generic).find(searchMD[field])>-1:
                                             flag=1
                                     else:
                                             flag=0
@@ -909,7 +909,10 @@ def writeMetadata(url,metadict,project=N
                                 metanode.removeChild(nodeOld[0]).unlink()
 
                 metanodeneu=dom.createElement(metaData)
-                metanodetext=dom.createTextNode(metadict[metaData].decode('utf-8'))
+		try:
+	                metanodetext=dom.createTextNode(metadict[metaData])
+		except:
+	                metanodetext=dom.createTextNode(metadict[metaData].decode('utf-8'))
                 #try:
                         #metanodetext=dom.createTextNode(unicode(metadict[metaData],"utf-8"))
                 #except: