--- ECHO_content/ECHO_helpers.py	2005/10/10 10:05:06	1.61
+++ 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"])
@@ -408,7 +419,7 @@ class ECHO_basis:
                 if hasattr(getattr(self,link),'link'):
                         cLink=getattr(self,link).link
                         # if existing delete virtuell path 
-                        if self.REQUEST.hasattr('VirtualRootPhysicalPath'):
+                        if hasattr(self.REQUEST,'VirtualRootPhysicalPath'):
                             cLink=cLink.replace('/'.join(self.REQUEST['VirtualRootPhysicalPath']),'')
 
                 if backLink and hasattr(getattr(self,link),'link') and backLink==self.REQUEST['SERVER_URL']+cLink.lstrip():
@@ -531,19 +542,18 @@ def checkOnlyOneInGroup(object):
                 return displayedObjects[0][1]
         else:           return object
 
-def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None):
-        
+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])
         
         def sortfnc(sortfield,x,y):
                 try:
-                        xa=x[1].getMDValue(sortfield)
+                        xa=x[1].getMDValue(sortfield,generic=generic)
                 except:
                         xa=""
                 try:
-                        ya=y[1].getMDValue(sortfield)
+                        ya=y[1].getMDValue(sortfield,generic=generic)
                 except:
                         ya=""
                 return cmp(xa,ya)
@@ -553,27 +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)==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:
@@ -626,14 +648,20 @@ def reloadMetaDataFromStorage(self,RESPO
             """copy metadata from the storage to ECHO"""
             ret=""
             resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
-
+            if RESPONSE is not None:
+                RESPONSE.setHeader("Content-Type", type)
+                RESPONSE.write("<html><body>\n")
+                
             for resource in resources:
                     x=str(resource[1].copyIndex_meta2echo_resource())+"<br>"
+                    if RESPONSE is not None:
+                        RESPONSE.write(x+"\n")
+                    
                     ret+=x
 
             if RESPONSE is not None:
                     #RESPONSE.redirect('./manage_main')
-                    return "<html><body>"+ret+"</html></body>"
+                    RESPONSE.write( "</html></body>")
 
             return ret
     
@@ -737,7 +765,7 @@ def checkDiffs(self,metadict):
     
             for field in tags[1]:
                     try:
-                            if (NoneToEmpty(self.getFieldValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]):
+                            if (NoneToEmpty(self.getMDValue(self.getFieldTag(tags,field)))==metadict[self.getFieldTag(tags,field)]):
                                     diffs[self.getFieldTag(tags,field)]=1
                             else: