r5579 - in trunk/gnue-common/src: apps datasources/drivers/interbase/interbase datasources/drivers/postgresql datasources/drivers/sapdb/sapdb

[reinhard]

Author: reinhard
Date: 2004-03-30 15:20:32 -0600 (Tue, 30 Mar 2004)
New Revision: 5579

Modified:
   trunk/gnue-common/src/apps/plugin.py
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
   trunk/gnue-common/src/datasources/drivers/postgresql/__init__.py
   trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py
Log:
Added support for __pluginalias__ in plugin loader.


Modified: trunk/gnue-common/src/apps/plugin.py
===================================================================
--- trunk/gnue-common/src/apps/plugin.py        2004-03-30 19:35:54 UTC (rev 
5578)
+++ trunk/gnue-common/src/apps/plugin.py        2004-03-30 21:20:32 UTC (rev 
5579)
@@ -266,6 +266,11 @@
     # This is not a plugin, ignore it
     return {}
 
+  # Is the searched driver an alias of this module?
+  if hasattr (m, '__pluginalias__'):
+    if name in m.__pluginalias__:
+      return __first (base, identifier)
+
   try:
     m = __import__ (base + '.' + name, None, None, '*')
   except ImportError:
@@ -296,7 +301,7 @@
 
     # List all modules
     for (name, result) in (list (base, 'Connection')).items ():
-      print name + ":",
+      print name [len(base)+1:]  + ":",
       if isinstance (result, ModuleType):
         print "ok"
       else:

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py   
2004-03-30 19:35:54 UTC (rev 5578)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py   
2004-03-30 21:20:32 UTC (rev 5579)
@@ -22,6 +22,9 @@
 interbase init file
 """
 
+# Define alias for 'firebird'
+__pluginalias__ = ['firebird']
+
 # Test if plugin is functional
 def __initplugin__ ():
   import Connection

Modified: trunk/gnue-common/src/datasources/drivers/postgresql/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/__init__.py    
2004-03-30 19:35:54 UTC (rev 5578)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/__init__.py    
2004-03-30 21:20:32 UTC (rev 5579)
@@ -22,4 +22,7 @@
 Driver structure for PostgreSQL databases.
 """
 
+# Define alias for plugin loader
+__pluginalias__ = ['pgsql', 'postgres']
+
 DRIVERS=['psycopg','popy','pygresql','pypgsql']

Modified: trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py   
2004-03-30 19:35:54 UTC (rev 5578)
+++ trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py   
2004-03-30 21:20:32 UTC (rev 5579)
@@ -22,6 +22,9 @@
 init file
 """
 
+# Define alias
+__pluginalias__ = ['maxdb']
+
 # Test if plugin is functional
 def __initplugin__ ():
   import Connection