Diff for /ECHO_content/ECHO_helpers.py between versions 1.65 and 1.67

version 1.65, 2005/11/25 18:46:40 version 1.67, 2005/12/01 12:11:51
Line 14  from AccessControl import ClassSecurityI Line 14  from AccessControl import ClassSecurityI
 import os.path  import os.path
 from OFS.Folder import Folder  from OFS.Folder import Folder
 import ECHO_collection  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']  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):  def content_html(self,type):
         """template fuer content"""          """template fuer content"""
         #templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"])          #templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"])
Line 553  def getSubCols(self, sortfield=None, sub Line 564  def getSubCols(self, sortfield=None, sub
   
                   
         if searchSimple and (not (searchSimple==""))and hasattr(self,'resourceCatalog'):          if searchSimple and (not (searchSimple==""))and hasattr(self,'resourceCatalog'):
               
             searchString=" AND ".join(searchSimple.split())              searchString=" AND ".join(searchSimple.split())
              
             ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString})]              ids=[x.getObject() for x in self.resourceCatalog({'getMDValueSimpleSearchField':searchString})]
                           
         else:          else:
Line 601  def getSubCols(self, sortfield=None, sub Line 614  def getSubCols(self, sortfield=None, sub
         else:          else:
                 tmplist.sort(sortWithMD(sortFieldMD))                  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']):  def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
         """Rerender all Links"""          """Rerender all Links"""

Removed from v.1.65  
changed lines
  Added in v.1.67


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>