--- ZSQLExtend/ZSQLExtend.py	2004/07/20 12:07:57	1.27
+++ ZSQLExtend/ZSQLExtend.py	2004/07/26 15:43:26	1.28
@@ -10,9 +10,13 @@ from AccessControl import getSecurityMan
 import os.path
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
+from Products.ZSQLMethods.SQL import SQLConnectionIDs
+import Shared.DC.ZRDB.DA
 
+def showSQLConnectionIDs(self):
+    return SQLConnectionIDs(self)
 
-class ZSQLExtendFolder(Persistent, Implicit, Folder):
+class ZSQLExtendFolder(Folder,Persistent, Implicit):
     """Folder"""
     meta_type="ZSQLExtendFolder"
 
@@ -60,9 +64,9 @@ class ZSQLExtendFolder(Persistent, Impli
         return pt()
 
 
-    def changeZSQLExtend(self,label,description,weight=0,REQUEST=None):
+    def changeZSQLExtend(self,label,description,weight=0,REQUEST=None,connection_id=None):
         """change it"""
-
+        self.connection_id=connection_id
         self.weight=weight
         self.label=label
         self.description=description
@@ -231,9 +235,24 @@ class ZSQLExtendFolder(Persistent, Impli
     
 
         #print "INLINE:",query
+        return self.ZSQLSimpleSearch(var=query)
         
-        return self.search(var=query)
+
+    def ZSQLSimpleSearch(self,query=None):
+        """ returrn SQLSearch"""
+        if not query:
+            query=self.query
+           
+        if self.search.meta_type=="Z SQL Method":
+            return self.search(var=query)
+        else:
+            if self.aq_parent.aq_parent.search.meta_type=="Z SQL Method":
+                return self.aq_parent.aq_parent.search(var=query)
+            else:
+                return []
     
+        
+        
     def ZSQLAdd(self):
         """Neuer Eintrag"""
         qs=self.REQUEST['QUERY_STRING']
@@ -260,7 +279,7 @@ class ZSQLExtendFolder(Persistent, Impli
         valueString=string.join(valueList,",")
         
         queryString="INSERT INTO %s (%s) VALUES (%s)"%(table,keyString,valueString)
-        self.search(var=queryString)
+        self.ZSQLSimpleSearch(var=queryString)
         return self.REQUEST.RESPONSE.redirect(format)
         
     def ZSQLChange(self,**argv):
@@ -294,7 +313,7 @@ class ZSQLExtendFolder(Persistent, Impli
                 changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value)))
         changeString=string.join(changeList,",")
         queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify)
-        self.search(var=queryString)
+        self.ZSQLSimpleSearch(var=queryString)
         return self.REQUEST.RESPONSE.redirect(format)
 
     def ZSQLChange_old(self):
@@ -319,7 +338,7 @@ class ZSQLExtendFolder(Persistent, Impli
                 changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value)))
         changeString=string.join(changeList,",")
         queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify)
-        self.search(var=queryString)
+        self.ZSQLSimpleSearch(var=queryString)
         return self.REQUEST.RESPONSE.redirect(format)
     
     def ZSQLFind(self,qs="",select="oid,*",storename=None,**argv):
@@ -558,12 +577,12 @@ class ZSQLExtendFolder(Persistent, Impli
                 if not self.REQUEST.SESSION[storename]['queryString2']==query2:
                     #print "HOOOOO",storename
                     self.REQUEST.SESSION[storename]['queryString2']=query2
-                    self.REQUEST.SESSION[storename]['count']=self.search(var=query2)[0].count
+                    self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(var=query2)[0].count
                     #print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2']
                 
             else:
                 self.REQUEST.SESSION[storename]['queryString2']=query2
-                self.REQUEST.SESSION[storename]['count']=self.search(var=query2)[0].count
+                self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(var=query2)[0].count
                 #print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2']
             
             
@@ -580,7 +599,7 @@ class ZSQLExtendFolder(Persistent, Impli
 
     def ZSQLQuery(self,query):
         """query"""
-        return self.search(var=query)
+        return self.ZSQLSimpleSearch(var=query)
     
     def ZSQLSearch(self):
         """To be done"""
@@ -791,6 +810,7 @@ manage_addZSQLExtendFolderForm=DTMLFile(
 def manage_addZSQLExtendFolder(self, id, title='', label='', description='',
                      createPublic=0,
                      createUserF=0,
+                     connection_id=None,
                      REQUEST=None):
     """Add a new Folder object with id *id*.
 
@@ -807,6 +827,7 @@ def manage_addZSQLExtendFolder(self, id,
     ob=self._getOb(id)
     setattr(ob,'label',label)
     setattr(ob,'description',description)
+    setattr(ob,'connection_id',connection_id)
     
     checkPermission=getSecurityManager().checkPermission
 
@@ -965,7 +986,7 @@ class ZSQLBibliography(Folder,ZSQLExtend
         """index"""
         ret="""<?xml version="1.0" ?>
 	             <index>"""
-        for found in self.search(var="select oid from %s limit ALL"%self.tableName):
+        for found in self.ZSQLSimpleSearch(var="select oid from %s limit ALL"%self.tableName):
             link=self.absolute_url()+"/"+"record.html?oid=%i"%found.oid
             metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid