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

Diff for /ECHO_content/ECHO_Nav.py between versions 1.48 and 1.49

version 1.48, 2004/10/28 13:38:39 version 1.49, 2004/10/28 14:15:02
Line 32  import urllib Line 32  import urllib
 from ECHO_helpers import displayTypes,checkOnlyOneInGroup  from ECHO_helpers import displayTypes,checkOnlyOneInGroup
 from ECHO_collection import content_html  from ECHO_collection import content_html
   
   try:    
       from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
   except:
       zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported')
   
   
   
Line 117  class ECHO_ZCatalogElement(SimpleItem): Line 121  class ECHO_ZCatalogElement(SimpleItem):
   
 def manage_addECHO_ZCatalogElementForm(self):  def manage_addECHO_ZCatalogElementForm(self):
     """Form for adding"""      """Form for adding"""
     pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_content/zpt/AddECHO_ZCatalogElement.zpt')).__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_ZCatalogElement.zpt')).__of__(self)
     return pt()      return pt()
   
 def manage_addECHO_ZCatalogElement(self,id,title,field,baseUrl,weight,contentType,RESPONSE=None):  def manage_addECHO_ZCatalogElement(self,id,title,field,baseUrl,weight,contentType,RESPONSE=None):
Line 255  class ECHO_sqlElement(SimpleItem): Line 259  class ECHO_sqlElement(SimpleItem):
         if RESPONSE is not None:          if RESPONSE is not None:
             RESPONSE.redirect('manage_main')              RESPONSE.redirect('manage_main')
   
     def searchQuery(self,query=None,obj=None):      try:    
         #presently a hack, tests if search is of the search method, if not look at the next level.          searchQuery=ZSQLExtendFolder.ZSQLSimpleSearch
         #      except:
         #return self.ZSQLsimpleSearch(var=self.query)          zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported')
         if not query:  
             query=self.query  
              
         if self.search.meta_type=="Z SQL Method":  
             return self.search(var=self.query)  
         else:  
             if self.aq_parent.aq_parent.search.meta_type=="Z SQL Method":  
                 return self.aq_parent.aq_parent.search(var=self.query)  
             else:  
                 return []  
           
           
           
           
     def getNavList(self):      def getNavList(self):
         """ausgabe der treffer list für navigation"""          """ausgabe der treffer list für navigation"""
Line 371  class ECHO_pageTemplate(ZopePageTemplate Line 362  class ECHO_pageTemplate(ZopePageTemplate
   
 def manage_addECHO_pageTemplateForm(self):  def manage_addECHO_pageTemplateForm(self):
     """Form for adding"""      """Form for adding"""
     pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','Products/ECHO_content/zpt/AddECHO_pageTemplate.zpt')).__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_pageTemplate.zpt')).__of__(self)
     return pt()      return pt()
   
 from urllib import quote  from urllib import quote
Removed from v.1.48  
changed lines
  Added in v.1.49

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