--- SQL.py.orig Thu Dec 7 17:07:00 2000 +++ SQL.py Thu Dec 7 17:08:44 2000 @@ -91,6 +91,25 @@ import Shared.DC.ZRDB.DA from Globals import HTMLFile +def TF_SQLConnectionIDs(self,ids): + have_id=ids.has_key + StringType=type('') + + if hasattr(self, 'objectValues'): + for o in self.objectValues(): + if (hasattr(o,'_isAnSQLConnection') and o._isAnSQLConnection and hasattr(o,'id')): + id=o.id + if type(id) is not StringType: id=id() + if not have_id(id): + if hasattr(o,'title_and_id'): o=o.title_and_id() + else: o=id + ids[id]=id + + if (hasattr(o,'meta_type') and (o.meta_type == 'Transparent Folder')): + ids = TF_SQLConnectionIDs(o,ids) + + return ids + def SQLConnectionIDs(self): """Find SQL database connections in the current folder and above @@ -111,6 +130,10 @@ if hasattr(o,'title_and_id'): o=o.title_and_id() else: o=id ids[id]=id + + if (hasattr(o,'meta_type') and (o.meta_type == 'Transparent Folder')): + ids = TF_SQLConnectionIDs(o,ids) + if hasattr(self, 'aq_parent'): self=self.aq_parent else: self=None