--- ECHO_content/ECHO_Nav.py	2004/10/28 13:38:39	1.48
+++ ECHO_content/ECHO_Nav.py	2004/11/24 15:20:14	1.50
@@ -31,7 +31,12 @@ from Globals import package_home
 import urllib
 from ECHO_helpers import displayTypes,checkOnlyOneInGroup
 from ECHO_collection import content_html
+import zLOG
 
+try:    
+    from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
+except:
+    zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported')
 
 
 
@@ -117,7 +122,7 @@ class ECHO_ZCatalogElement(SimpleItem):
 
 def manage_addECHO_ZCatalogElementForm(self):
     """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()
 
 def manage_addECHO_ZCatalogElement(self,id,title,field,baseUrl,weight,contentType,RESPONSE=None):
@@ -255,25 +260,12 @@ class ECHO_sqlElement(SimpleItem):
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
-    def searchQuery(self,query=None,obj=None):
-        #presently a hack, tests if search is of the search method, if not look at the next level.
-        #
-        #return self.ZSQLsimpleSearch(var=self.query)
-        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):
+    try:    
+        searchQuery=ZSQLExtendFolder.ZSQLSimpleSearch
+    except:
+        zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported')
+            
+    def getNavList(self): 
         """ausgabe der treffer list für navigation"""
         
         records=self.searchQuery()
@@ -371,7 +363,7 @@ class ECHO_pageTemplate(ZopePageTemplate
 
 def manage_addECHO_pageTemplateForm(self):
     """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()
 
 from urllib import quote