--- ECHO_content/ECHO_helpers.py	2005/10/28 17:49:45	1.63
+++ ECHO_content/ECHO_helpers.py	2005/12/01 12:11:51	1.67
@@ -14,9 +14,20 @@ from AccessControl import ClassSecurityI
 import os.path
 from OFS.Folder import Folder
 import ECHO_collection
+import base64
+import bz2
+import xmlrpclib
 
 displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ECHO_externalLink','ImageCollectionIFrame','VLP_resource','VLP_essay','ECHO_ZCatalogElement','ImageCollection','versionedFileFolder','ECHO_movie']
 
+
+#decode and compress for xmlrpc communication with OSAS_server
+
+def encodeRPC(string):
+    return base64.encodestring(bz2.compress(string))
+def decodeRPC(string):
+    return bz2.decompress(base64.decodestring(string))
+
 def content_html(self,type):
         """template fuer content"""
         #templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"])
@@ -531,7 +542,7 @@ def checkOnlyOneInGroup(object):
                 return displayedObjects[0][1]
         else:           return object
 
-def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,generic="yes"):
+def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchSimple=None,generic="yes"):
         
         def sort(x,y):
                 return cmp(x[0],y[0])
@@ -552,28 +563,37 @@ def getSubCols(self, sortfield=None, sub
         displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes)
 
         
-        
-        for entry in displayedObjects:
-
+        if searchSimple and (not (searchSimple==""))and hasattr(self,'resourceCatalog'):
+            
+            searchString=" AND ".join(searchSimple.split())
+           
+            ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString})]
+           
+        else:
+            for entry in displayedObjects:
+    
+                            
+                    object=entry[1]
+                    if searchMD and hasattr(object,'getMDValue'):
+                            flag=0
+                            for field in searchMD.keys():
+                                    #if object.getMDValue(field,generic=generic)==searchMD[field]:
+                                    if re.match(searchMD[field],object.getMDValue(field,generic=generic)):
+                                            flag=1
+                                    else:
+                                            flag=0
+                                            break
+                            if flag==1:
+                                    ids.append(object)
+                                    
                         
-                object=entry[1]
-                if searchMD and hasattr(object,'getMDValue'):
-                        flag=0
-                        for field in searchMD.keys():
-                                if object.getMDValue(field,generic=generic)==searchMD[field]:
-                                        flag=1
-                                else:
-                                        flag=0
-                                        break
-                        if flag==1:
-                                ids.append(object)
-                else:
-                        ids.append(object)
+                    else:
+                            ids.append(object)
 
         if not sortfield:
             sortfield=getattr(self,'sortfield','weight')
 
-            
+     
         tmplist=[]
 
         for x in ids:
@@ -594,7 +614,9 @@ def getSubCols(self, sortfield=None, sub
         else:
                 tmplist.sort(sortWithMD(sortFieldMD))
         
-        return [x for (key,x) in tmplist]
+        ret=[x for (key,x) in tmplist]
+      
+        return ret
 
 def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
         """Rerender all Links"""
@@ -608,7 +630,7 @@ def ECHO_rerenderLinksMD(self,obj=None,t
         for entry in entries:
                 if entry[1].meta_type == 'ECHO_resource':
                         try:
-                                entry[1].ECHO_getResourceMD(template="no")
+                                entry[1].ECHO_getResourceMD(template="no",overwrite="yes")
                                 if "title" in types:
                                     entry[1].generate_title()
                                 if "label" in types: