[BACK]Return to ECHO_helpers.py CVS log [TXT] [DIR] Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_helpers.py between versions 1.78 and 1.79

version 1.78, 2007/01/23 16:50:11 version 1.79, 2007/01/23 18:22:29
Line 18  import base64 Line 18  import base64
 import bz2  import bz2
 import xmlrpclib  import xmlrpclib
 import zLOG  import zLOG
   import logging
   
 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']
   
Line 37  def content_html(self,type): Line 38  def content_html(self,type):
         #    return templates[0][1]()          #    return templates[0][1]()
   
         if hasattr(self,type+"_template"):          if hasattr(self,type+"_template"):
               logging.info("type: %s"%type)
             obj=getattr(self,type+"_template")              obj=getattr(self,type+"_template")
             return obj()              return obj()
         else:          else:
Line 574  def checkOnlyOneInGroup(object): Line 576  def checkOnlyOneInGroup(object):
         else:           return object          else:           return object
   
   
 def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None,searchMD=None,searchMD_modus='search',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,
                  isVisible=True):
                   
         def sort(x,y):          def sort(x,y):
                 return cmp(x[0],y[0])                  return cmp(x[0],y[0])
Line 596  def getSubCols(self, sortfield=None, sub Line 605  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,'getIsVisible':True})]         
         else:          else:
             for entry in displayedObjects:                     for entry in displayedObjects:       
                     object=entry[1]                      object=entry[1]
Removed from v.1.78  
changed lines
  Added in v.1.79

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