commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnue] r7615 - in trunk: gnue-common/src/datasources/drivers/adodbapi gn


From: reinhard
Subject: [gnue] r7615 - in trunk: gnue-common/src/datasources/drivers/adodbapi gnue-common/src/datasources/drivers/adodbapi/adodbapi gnue-common/src/datasources/drivers/appserver gnue-common/src/datasources/drivers/appserver/appserver gnue-common/src/datasources/drivers/file gnue-common/src/datasources/drivers/interbase gnue-common/src/datasources/drivers/interbase/interbase gnue-common/src/datasources/drivers/maxdb gnue-common/src/datasources/drivers/maxdb/maxdb gnue-common/src/datasources/drivers/mysql gnue-common/src/datasources/drivers/mysql/mysql gnue-common/src/datasources/drivers/oracle gnue-common/src/datasources/drivers/oracle/cxoracle gnue-common/src/datasources/drivers/oracle/dcoracle gnue-common/src/datasources/drivers/postgresql gnue-common/src/datasources/drivers/postgresql/psycopg gnue-common/src/datasources/drivers/postgresql/pygresql gnue-common/src/datasources/drivers/postgresql/pypgsql gnue-common/src/datasources/drivers/sqlite gnue-common/src/datasources/drivers/sqlite/sqlite gnue-common/utils/helpers www/utils/webhelpers
Date: Fri, 17 Jun 2005 10:24:03 -0500 (CDT)

Author: reinhard
Date: 2005-06-17 10:24:00 -0500 (Fri, 17 Jun 2005)
New Revision: 7615

Removed:
   trunk/gnue-common/src/datasources/drivers/adodbapi/Info.py
   trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Info.py
   trunk/gnue-common/src/datasources/drivers/appserver/Info.py
   trunk/gnue-common/src/datasources/drivers/appserver/appserver/Info.py
   trunk/gnue-common/src/datasources/drivers/interbase/Info.py
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/Info.py
   trunk/gnue-common/src/datasources/drivers/maxdb/Info.py
   trunk/gnue-common/src/datasources/drivers/maxdb/maxdb/Info.py
   trunk/gnue-common/src/datasources/drivers/mysql/Info.py
   trunk/gnue-common/src/datasources/drivers/mysql/mysql/Info.py
   trunk/gnue-common/src/datasources/drivers/oracle/Info.py
   trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/Info.py
   trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/Info.py
   trunk/gnue-common/src/datasources/drivers/postgresql/Info.py
   trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Info.py
   trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Info.py
   trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Info.py
   trunk/gnue-common/src/datasources/drivers/sqlite/Info.py
   trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Info.py
Modified:
   trunk/gnue-common/src/datasources/drivers/adodbapi/__init__.py
   trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py
   trunk/gnue-common/src/datasources/drivers/appserver/__init__.py
   trunk/gnue-common/src/datasources/drivers/appserver/appserver/__init__.py
   trunk/gnue-common/src/datasources/drivers/file/__init__.py
   trunk/gnue-common/src/datasources/drivers/file/csvfile.py
   trunk/gnue-common/src/datasources/drivers/file/dbffile.py
   trunk/gnue-common/src/datasources/drivers/file/inifile.py
   trunk/gnue-common/src/datasources/drivers/interbase/__init__.py
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
   trunk/gnue-common/src/datasources/drivers/maxdb/__init__.py
   trunk/gnue-common/src/datasources/drivers/maxdb/maxdb/__init__.py
   trunk/gnue-common/src/datasources/drivers/mysql/__init__.py
   trunk/gnue-common/src/datasources/drivers/mysql/mysql/__init__.py
   trunk/gnue-common/src/datasources/drivers/oracle/__init__.py
   trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py
   trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py
   trunk/gnue-common/src/datasources/drivers/postgresql/__init__.py
   trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py
   trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py
   trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py
   trunk/gnue-common/src/datasources/drivers/sqlite/__init__.py
   trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py
   trunk/gnue-common/utils/helpers/info.py
   trunk/www/utils/webhelpers/tools.py
Log:
Moved driver infos from separate file into main module.


Deleted: trunk/gnue-common/src/datasources/drivers/adodbapi/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/Info.py  2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/Info.py  2005-06-17 
15:24:00 UTC (rev 7615)
@@ -1,34 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Driver info for ADODB databases.
-"""
-
-#
-# Documentation
-#
-name = "MS ADO (MS SQL-Server/MS Access)"
-url = ""
-description = """
-The Microsoft ADO API allows access MS SQL-Server and MS Access databases.
-"""
-isfree = False  # Should be false for non-free DBMSs... we don't want to
-                    # show URLs for non-free on our website

Modified: trunk/gnue-common/src/datasources/drivers/adodbapi/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/__init__.py      
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/__init__.py      
2005-06-17 15:24:00 UTC (rev 7615)
@@ -21,3 +21,11 @@
 """
 Driver structure for ADODB databases.
 """
+
+class DriverInfo:
+  name = "MS ADO (MS SQL-Server/MS Access)"
+  url = ""
+  description = """
+The Microsoft ADO API allows access MS SQL-Server and MS Access databases.
+"""
+  isfree = False

Deleted: trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Info.py 
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Info.py 
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,83 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-
-#
-# Notes on this driver
-#
-name = "adodbapi"
-url = "http://sourceforge.net/projects/adodbapi";
-doc = """
-Description
------------
-A Python DB-API 2.0 module that makes it easy to use Microsoft ADO
-for connecting with databases and other data sources.
-
-Prerequisites:
-
-  * Mark Hammond's win32all python for windows extensions.
-
-
-Support
--------
-Supported Platforms:
-
-  - MS Windows 98/NT/2000/XP (Installer available)
-
-
-Connection Properties
-----------------------
-* oledb_provider   (required)
-* data_source      (required)
-* initial_catalog  (optional for SQL Server)
-* network_library  (optional for SQL Server)
-* data_provider    (optional for SQL Server)
-
-You can find more connection strings here:
-   http://www.able-consulting.com/MDAC/ADO/Connection/OLEDB_Providers.htm
-
-Examples
---------
-  [access]
-  comment = MS Access database
-  provider = adodbapi
-  oledb_provider = Microsoft.Jet.OLEDB.4.0
-  data_source = C:\mydb.mdb
-
-  [sqlserver]
-  comment = MS SQL Server database
-  provider = adodbapi
-  oledb_provider = sqloledb
-  data_source = myServerName
-  initial_catalog = myDatabaseName
-
-Notes
------
-1. This driver is only usable under MS Windows.
-
-2. This driver does not implement schema creation. Index introspection is not
-   supported by this driver
-
-3. MS SQL Server has been tested successfully.  MS Access backends need some
-   more testing
-
-4. Other than that, the driver is fully functional with no known serious
-   problems.
-"""

Modified: 
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py     
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py     
2005-06-17 15:24:00 UTC (rev 7615)
@@ -39,3 +39,72 @@
     import win32com
   except ImportError:
     raise GConnections.DependencyError, ('win32com', None)
+
+
+# -----------------------------------------------------------------------------
+# Driver info
+# -----------------------------------------------------------------------------
+
+class DriverInfo:
+
+  name = "adodbapi"
+
+  url = "http://sourceforge.net/projects/adodbapi";
+
+  doc = """
+Description
+-----------
+A Python DB-API 2.0 module that makes it easy to use Microsoft ADO
+for connecting with databases and other data sources.
+
+Prerequisites:
+
+  * Mark Hammond's win32all python for windows extensions.
+
+
+Support
+-------
+Supported Platforms:
+
+  - MS Windows 98/NT/2000/XP (Installer available)
+
+
+Connection Properties
+----------------------
+* oledb_provider   (required)
+* data_source      (required)
+* initial_catalog  (optional for SQL Server)
+* network_library  (optional for SQL Server)
+* data_provider    (optional for SQL Server)
+
+You can find more connection strings here:
+   http://www.able-consulting.com/MDAC/ADO/Connection/OLEDB_Providers.htm
+
+Examples
+--------
+  [access]
+  comment = MS Access database
+  provider = adodbapi
+  oledb_provider = Microsoft.Jet.OLEDB.4.0
+  data_source = C:\mydb.mdb
+
+  [sqlserver]
+  comment = MS SQL Server database
+  provider = adodbapi
+  oledb_provider = sqloledb
+  data_source = myServerName
+  initial_catalog = myDatabaseName
+
+Notes
+-----
+1. This driver is only usable under MS Windows.
+
+2. This driver does not implement schema creation. Index introspection is not
+   supported by this driver
+
+3. MS SQL Server has been tested successfully.  MS Access backends need some
+   more testing
+
+4. Other than that, the driver is fully functional with no known serious
+   problems.
+"""

Deleted: trunk/gnue-common/src/datasources/drivers/appserver/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/Info.py 2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/appserver/Info.py 2005-06-17 
15:24:00 UTC (rev 7615)
@@ -1,34 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Driver structure for GNUe AppServer-based database access.
-"""
-
-#
-# Documentation
-#
-name = "GNUe AppServer"
-url = "http://www.gnuenterprise.org/tools/appserver/";
-description = """
-GNUe AppServer is GNUe's middleware for database access.
-"""
-isfree = True  # Should be false for non-free DBMSs... we don't want to
-                   # show URLs for non-free on our website

Modified: trunk/gnue-common/src/datasources/drivers/appserver/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/__init__.py     
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/appserver/__init__.py     
2005-06-17 15:24:00 UTC (rev 7615)
@@ -21,3 +21,11 @@
 """
 Driver structure for GNUe AppServer-based database access.
 """
+
+class DriverInfo:
+  name = "GNUe AppServer"
+  url = "http://www.gnuenterprise.org/tools/appserver/";
+  description = """
+GNUe AppServer is GNUe's middleware for database access.
+"""
+  isfree = True

Deleted: trunk/gnue-common/src/datasources/drivers/appserver/appserver/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/appserver/Info.py       
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/appserver/appserver/Info.py       
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,70 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Information on this driver
-"""
-
-#
-# Notes on this driver
-#
-name = "GNUe AppServer Driver"
-url = "http://www.gnuenterprise.org/tools/appserver/";
-doc = """
-Description
------------
-Python driver GNUe Application Server.
-
-Support
--------
-POSIX Support: YES
-
-Win32 Support: YES
-
-Platforms Tested:
-
-  - Linux/Unix (Debian, RedHat, SuSe, etc)
-  - Windows NT/XP/2000
-
-Connection Properties
----------------------
-* host       -- This is the hostname/ip address of the host running AppServer 
(required)
-* port       -- The port that AppServer is running on (required)
-* timeout    -- Command timeout in seconds (optional)
-* transport  -- Transport used for network connections (http, https) (required)
-* rpctype    -- RPC driver used for network communication (xmlrpc, soap, etc.)
-  See GNUe Common's RPC documentation for a list of all RPC types. (required)
-
-Examples
---------
-  [appserver]
-  comment = Connection to the GNUe Application Server
-  provider = appserver
-  rpctype = xmlrpc
-  host = localhost
-  port = 8765
-  transport = http
-
-Notes
------
-1. GNUe AppServer works natively in utf-8, so encoding= is not a valid 
property.
-
-2. This driver is fully functional with no known serious problems.
-"""

Modified: 
trunk/gnue-common/src/datasources/drivers/appserver/appserver/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/appserver/__init__.py   
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/appserver/appserver/__init__.py   
2005-06-17 15:24:00 UTC (rev 7615)
@@ -27,3 +27,51 @@
 
 from Connection import Connection
 from ResultSet import ResultSet
+
+class DriverInfo:
+
+  name = "GNUe AppServer Driver"
+
+  url = "http://www.gnuenterprise.org/tools/appserver/";
+
+  doc = """
+Description
+-----------
+Python driver GNUe Application Server.
+
+Support
+-------
+POSIX Support: YES
+
+Win32 Support: YES
+
+Platforms Tested:
+
+  - Linux/Unix (Debian, RedHat, SuSe, etc)
+  - Windows NT/XP/2000
+
+Connection Properties
+---------------------
+* host       -- This is the hostname/ip address of the host running AppServer 
(required)
+* port       -- The port that AppServer is running on (required)
+* timeout    -- Command timeout in seconds (optional)
+* transport  -- Transport used for network connections (http, https) (required)
+* rpctype    -- RPC driver used for network communication (xmlrpc, soap, etc.)
+  See GNUe Common's RPC documentation for a list of all RPC types. (required)
+
+Examples
+--------
+  [appserver]
+  comment = Connection to the GNUe Application Server
+  provider = appserver
+  rpctype = xmlrpc
+  host = localhost
+  port = 8765
+  transport = http
+
+Notes
+-----
+1. GNUe AppServer works natively in utf-8, so encoding= is not a valid 
property.
+
+2. This driver is fully functional with no known serious problems.
+"""

Modified: trunk/gnue-common/src/datasources/drivers/file/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/file/__init__.py  2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/file/__init__.py  2005-06-17 
15:24:00 UTC (rev 7615)
@@ -24,3 +24,10 @@
 """
 Implementations of dbdrivers for use with various file formats
 """
+
+# =============================================================================
+# Driver info
+# =============================================================================
+
+class DriverInfo:
+  name = "File based backends"

Modified: trunk/gnue-common/src/datasources/drivers/file/csvfile.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/file/csvfile.py   2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/file/csvfile.py   2005-06-17 
15:24:00 UTC (rev 7615)
@@ -28,6 +28,45 @@
 
 
 # =============================================================================
+# Driver info
+# =============================================================================
+
+class DriverInfo:
+
+  name = "CSV files"
+
+  description = """
+CSV files are flat ASCII files where records are separated by newlines and
+fields are separated by a special character, like a comma or a semicolon.
+
+The CSV file driver is primarly provided to help with migration of legacy data.
+"""
+
+  doc = """
+Description
+-----------
+The GNUe CSV file driver uses Python's built-in csv module. It supports
+auto-guessing of the field separator and the quoting character.
+
+Connection Properties
+---------------------
+* filename -- File name of the CSV file. Can contain %%(home)s, %%(configdir)s,
+  and %%(table)s placeholders. Using the %%(table)s placeholder, this driver
+  can be used to emulate a database with several tables.
+
+Examples
+--------
+  [myconn]
+  provider = csvfile
+  filename = %%(home)s/data/%%(table)s.csv
+
+Notes
+-----
+1. This driver does not support write access.
+"""
+
+
+# =============================================================================
 # Connection class
 # =============================================================================
 

Modified: trunk/gnue-common/src/datasources/drivers/file/dbffile.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/file/dbffile.py   2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/file/dbffile.py   2005-06-17 
15:24:00 UTC (rev 7615)
@@ -27,6 +27,45 @@
 
 
 # =============================================================================
+# Driver Info
+# =============================================================================
+
+class DriverInfo:
+
+  name = "DBF files (DBase, XBase etc.)"
+
+  description = """
+DBF files are a file format often used in old DOS applications. Each DBF file
+contains data for a single table.
+
+The DBF file driver is primarly provided to help with migration of legacy data.
+"""
+
+  doc = """
+Description
+-----------
+The GNUe DBF file driver comes with its own file parsing routines and does not
+depend on any external module.
+
+Connection Properties
+---------------------
+* filename -- File name of the DBF file. Can contain %%(home)s, %%(configdir)s,
+  and %%(table)s placeholders. Using the %%(table)s placeholder, this driver
+  can be used to emulate a database with several tables.
+
+Examples
+--------
+  [myconn]
+  provider = dbffile
+  filename = %%(home)s/data/%%(table)s.dbf
+
+Notes
+-----
+1. This driver does not support write access.
+"""
+
+
+# =============================================================================
 # Connection class
 # =============================================================================
 

Modified: trunk/gnue-common/src/datasources/drivers/file/inifile.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/file/inifile.py   2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/file/inifile.py   2005-06-17 
15:24:00 UTC (rev 7615)
@@ -29,6 +29,46 @@
 
 
 # =============================================================================
+# Driver info
+# =============================================================================
+
+class DriverInfo:
+
+  name = "INI style configuration files"
+
+  description = """
+INI files are configuration files in the style of Samba's "smb.conf". Sections
+(introduced by a line enclosed in brackets) are considered records, and the
+parameters in this section are considered the fields of the record.
+
+The INI file driver is primarly provided to make it possible to use GNUe-Forms
+to edit configuration files (like connections.conf).
+"""
+
+  doc = """
+Description
+-----------
+The GNUe INI file driver uses Python's built-in configfile module. It does not
+depend on any external module.
+
+Connection Properties
+---------------------
+* filename -- File name of the INI file. Can contain %%(home)s, %%(configdir)s,
+  and %%(table)s placeholders.
+
+Examples
+--------
+  [myconn]
+  provider = inifile
+  filename = %%(configdir)s/connections.conf
+
+Notes
+-----
+1. This driver is not intended to be used with real data.
+"""
+
+
+# =============================================================================
 # Exceptions
 # =============================================================================
 

Deleted: trunk/gnue-common/src/datasources/drivers/interbase/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/Info.py 2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/interbase/Info.py 2005-06-17 
15:24:00 UTC (rev 7615)
@@ -1,45 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Info for this database.
-"""
-
-#
-# Documentation
-#
-name = "Firebird/Interbase"
-url = "http://www.firebirdsql.org/";
-description = """
-Firebird is a free relational database offering many ANSI SQL-92 features that
-runs on GNU/Linux, Windows, and a variety of Unix platforms. Firebird offers
-excellent concurrency, high performance, and powerful language support for
-stored procedures and triggers. It has been used in production systems,
-under a variety of names since 1981.
-
-Interbase is a proprietary database available from Borland.
-
-Firebird and Interbase share a common API, which allows GNUe to use the same
-drivers for both.
-
-Firebird is a popular choice of GNUe's Windows-based developers.
-"""
-isfree = False  # Should be false for non-free DBMSs... we don't want to
-                   # show URLs for non-free on our website

Modified: trunk/gnue-common/src/datasources/drivers/interbase/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/__init__.py     
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/interbase/__init__.py     
2005-06-17 15:24:00 UTC (rev 7615)
@@ -21,3 +21,22 @@
 """
 Driver structure for Interbase databases.
 """
+
+class DriverInfo:
+  name = "Firebird/Interbase"
+  url = "http://www.firebirdsql.org/";
+  description = """
+Firebird is a free relational database offering many ANSI SQL-92 features that
+runs on GNU/Linux, Windows, and a variety of Unix platforms. Firebird offers
+excellent concurrency, high performance, and powerful language support for
+stored procedures and triggers. It has been used in production systems,
+under a variety of names since 1981.
+
+Interbase is a proprietary database available from Borland.
+
+Firebird and Interbase share a common API, which allows GNUe to use the same
+drivers for both.
+
+Firebird is a popular choice of GNUe's Windows-based developers.
+"""
+  isfree = True

Deleted: trunk/gnue-common/src/datasources/drivers/interbase/interbase/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/Info.py       
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/Info.py       
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,64 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Information on this driver
-"""
-
-#
-# Notes on this driver
-#
-name = "kinterbasdb Firebird/Interbase Driver"
-url = "http://kinterbasdb.sourceforge.net";
-doc = """
-Description
------------
-Written by Alexander Kuznetsov, kinterbasdb provides support for
-Firebird and Interbase.
-
-Support
--------
-Supported Platforms:
-
-  - Linux/BSD
-  - MS Windows 98/NT/2000/XP (Installer available)
-
-
-Connection Properties
----------------------
-* host       -- This is the hostname running your database server (optional)
-* dbname     -- This is the name of the database to use (required)
-
-Examples
---------
-  [myconn]
-  provider=firebird       # Use the kinterbasdb adapter
-  host=localhost          # The hostname/IP of the Firebird host
-  dbname=mydb             # The name of the Firebird database
-
-  [myconn2]
-  provider=interbase      # Use the kinterbasdb adapter
-  host=localhost          # The hostname/IP of the Interbase host
-  dbname=mydb             # The name of the Interbase database
-
-Notes
------
-1. This driver is fully fuctional and has no serious known problems.
-"""

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py   
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py   
2005-06-17 15:24:00 UTC (rev 7615)
@@ -42,3 +42,50 @@
     import kinterbasdb
   except ImportError:
     raise GConnections.DependencyError, ('Kinterbasdb', None)
+
+
+# -----------------------------------------------------------------------------
+# Driver info
+# -----------------------------------------------------------------------------
+
+class DriverInfo:
+
+  name = "kinterbasdb Firebird/Interbase Driver"
+
+  url = "http://kinterbasdb.sourceforge.net";
+
+  doc = """
+Description
+-----------
+Written by Alexander Kuznetsov, kinterbasdb provides support for
+Firebird and Interbase.
+
+Support
+-------
+Supported Platforms:
+
+  - Linux/BSD
+  - MS Windows 98/NT/2000/XP (Installer available)
+
+
+Connection Properties
+---------------------
+* host       -- This is the hostname running your database server (optional)
+* dbname     -- This is the name of the database to use (required)
+
+Examples
+--------
+  [myconn]
+  provider=firebird       # Use the kinterbasdb adapter
+  host=localhost          # The hostname/IP of the Firebird host
+  dbname=mydb             # The name of the Firebird database
+
+  [myconn2]
+  provider=interbase      # Use the kinterbasdb adapter
+  host=localhost          # The hostname/IP of the Interbase host
+  dbname=mydb             # The name of the Interbase database
+
+Notes
+-----
+1. This driver is fully fuctional and has no serious known problems.
+"""

Deleted: trunk/gnue-common/src/datasources/drivers/maxdb/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/maxdb/Info.py     2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/maxdb/Info.py     2005-06-17 
15:24:00 UTC (rev 7615)
@@ -1,41 +0,0 @@
-# GNU Enterprise Common - Database Drivers - MaxDB/SAP-DB
-#
-# Copyright 2001-2005 Free Software Foundation
-#
-# This file is part of GNU Enterprise
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
-"""
-Info for this database.
-"""
-
-#
-# Documentation
-#
-name = "MaxDB (formerly SAP-DB)"
-url = "http://www.mysql.com/products/maxdb/";
-description = """
-MySQL's MaxDB is an enhanced version of SAP DB, SAP AG's open source
-database. MaxDB is a heavy-duty, SAP-certified open source database
-that offers high availability, scalability and a comprehensive
-feature set.
-
-MaxDB is licensed under both the GPL and a fee-based, commercial license.
-"""
-isfree = True  # Should be false for non-free DBMSs... we don't want to
-                   # show URLs for non-free on our website

Modified: trunk/gnue-common/src/datasources/drivers/maxdb/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/maxdb/__init__.py 2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/maxdb/__init__.py 2005-06-17 
15:24:00 UTC (rev 7615)
@@ -21,3 +21,16 @@
 """
 Driver structure for this databases.
 """
+
+class DriverInfo:
+  name = "MaxDB (formerly SAP-DB)"
+  url = "http://www.mysql.com/products/maxdb/";
+  description = """
+MySQL's MaxDB is an enhanced version of SAP DB, SAP AG's open source
+database. MaxDB is a heavy-duty, SAP-certified open source database
+that offers high availability, scalability and a comprehensive
+feature set.
+
+MaxDB is licensed under both the GPL and a fee-based, commercial license.
+"""
+  isfree = True

Deleted: trunk/gnue-common/src/datasources/drivers/maxdb/maxdb/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/maxdb/maxdb/Info.py       
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/maxdb/maxdb/Info.py       
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,70 +0,0 @@
-# GNU Enterprise Common - Database Drivers - MaxDB/SAP-DB
-#
-# Copyright 2001-2005 Free Software Foundation
-#
-# This file is part of GNU Enterprise
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
-"""
-Information on this driver
-"""
-
-#
-# Notes on this driver
-#
-name = "MySQL's MaxDB driver"
-url = "http://www.mysql.com/products/maxdb/sapdbapi.html";
-doc = """
-Description
------------
-Python driver for MaxDB/SAPDB version 7.x+.
-
-Support
--------
-Supported Platforms:
-
-  - Linux/BSD
-  - MS Windows 98/NT/2000/XP
-
-Connection Properties
----------------------
-* host       -- This is the MaxDB host for your connection (optional)
-* dbname     -- This is the MaxDB database to use (required)
-* timeout    -- Command timeout in seconds (optional)
-* isolation  -- Isolation level (optional) (0, 1 [default], 10, 15, 2, 20, 3, 
30)
-* sqlmode    -- INTERNAL (default) or ORACLE (optional)
-* sqlsubmode -- ODBC or empty (optional)
-
-Examples
---------
-# This connection uses the SAP DB  driver
-# We will be connecting to the SAP DB server on
-# "localhost" to a database called "TST".
-[sapdb]
-comment = XYZ Development Database
-provider = sapdb
-host=dbs.mydomain.com
-dbname = TST
-timeout = 900
-
-
-Notes
------
-
-1.  The driver is fully functional
-"""

Modified: trunk/gnue-common/src/datasources/drivers/maxdb/maxdb/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/maxdb/maxdb/__init__.py   
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/maxdb/maxdb/__init__.py   
2005-06-17 15:24:00 UTC (rev 7615)
@@ -43,3 +43,52 @@
 
   except ImportError:
     raise GConnections.DependencyError, ('sapdb', None)
+
+
+# -----------------------------------------------------------------------------
+# Driver info
+# -----------------------------------------------------------------------------
+
+class DriverInfo:
+
+  name = "MySQL's MaxDB driver"
+
+  url = "http://www.mysql.com/products/maxdb/sapdbapi.html";
+
+  doc = """
+Description
+-----------
+Python driver for MaxDB/SAPDB version 7.x+.
+
+Support
+-------
+Supported Platforms:
+
+  - Linux/BSD
+  - MS Windows 98/NT/2000/XP
+
+Connection Properties
+---------------------
+* host       -- This is the MaxDB host for your connection (optional)
+* dbname     -- This is the MaxDB database to use (required)
+* timeout    -- Command timeout in seconds (optional)
+* isolation  -- Isolation level (optional) (0, 1 [default], 10, 15, 2, 20, 3, 
30)
+* sqlmode    -- INTERNAL (default) or ORACLE (optional)
+* sqlsubmode -- ODBC or empty (optional)
+
+Examples
+--------
+# This connection uses the SAP DB  driver
+# We will be connecting to the SAP DB server on
+# "localhost" to a database called "TST".
+[sapdb]
+comment = XYZ Development Database
+provider = sapdb
+host=dbs.mydomain.com
+dbname = TST
+timeout = 900
+
+Notes
+-----
+1.  The driver is fully functional
+"""

Deleted: trunk/gnue-common/src/datasources/drivers/mysql/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/Info.py     2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/mysql/Info.py     2005-06-17 
15:24:00 UTC (rev 7615)
@@ -1,42 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Info for this database.
-"""
-
-#
-# Documentation
-#
-name = "MySQL (4.x+)"
-url = "http://www.mysql.org/";
-description = """
-MySQL is a fast database that runs on numerous platforms. It is one of the
-most popular free databases available.
-
-Given the transactional nature of GNUe, we recommend using MySQL 4.x+ with
-transaction support compiled in.
-
-Not all features of GNUe are usable under MySQL, such as auto-populating fields
-with serials/sequences and query-by-detail.
-"""
-
-isfree = True  # Should be false for non-free DBMSs... we don't want to
-                   # show URLs for non-free on our website

Modified: trunk/gnue-common/src/datasources/drivers/mysql/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/__init__.py 2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/mysql/__init__.py 2005-06-17 
15:24:00 UTC (rev 7615)
@@ -21,3 +21,18 @@
 """
 Driver structure for MySQL databases.
 """
+
+class DriverInfo:
+  name = "MySQL (4.x+)"
+  url = "http://www.mysql.org/";
+  description = """
+MySQL is a fast database that runs on numerous platforms. It is one of the
+most popular free databases available.
+
+Given the transactional nature of GNUe, we recommend using MySQL 4.x+ with
+transaction support compiled in.
+
+Not all features of GNUe are usable under MySQL, such as auto-populating fields
+with serials/sequences and query-by-detail.
+"""
+  isfree = True

Deleted: trunk/gnue-common/src/datasources/drivers/mysql/mysql/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/mysql/Info.py       
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/mysql/mysql/Info.py       
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,65 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Information on this driver
-"""
-
-#
-# Notes on this driver
-#
-name = "MySQLdb"
-url = "http://sourceforge.net/projects/mysql-python";
-doc = """
-Description
------------
-Mysql-python, written by Andy Dustman, supports MySQL 3.22, 3.23, and
-4.x.
-
-Support
--------
-Supported Platforms:
-
-  - Linux/BSD
-  - Solaris
-  - MS Windows 98/NT/2000/XP (Installer available)
-
-Connection Properties
-----------------------
-* host       -- This is the host for your connection (required)
-* dbname     -- This is the name of the database to use (required)
-
-Examples
---------
- [myconn]
- provider=mysql          # Use the MySQLdb adapter
- host=localhost          # The hostname/IP of the MySQL host
- dbname=mydb             # The name of the MySQL database
-
-Notes
------
-1. Transactions are supported if MySQL is compiled with proper
-   transactional support (3.x series does NOT do this by default!).
-
-2. Windows installer available at http://www.cs.fhm.edu/~ifw00065/.
-
-3. Other than that, the driver is fully functional with no known serious
-   problems.
-"""

Modified: trunk/gnue-common/src/datasources/drivers/mysql/mysql/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/mysql/__init__.py   
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/mysql/mysql/__init__.py   
2005-06-17 15:24:00 UTC (rev 7615)
@@ -36,3 +36,51 @@
   except ImportError:
     raise GConnections.DependencyError ('mysql-python',
         'http://sourceforge.net/projects/mysql-python')
+
+
+# -----------------------------------------------------------------------------
+# Driver info
+# -----------------------------------------------------------------------------
+
+class DriverInfo:
+
+  name = "MySQLdb"
+
+  url = "http://sourceforge.net/projects/mysql-python";
+
+  doc = """
+Description
+-----------
+Mysql-python, written by Andy Dustman, supports MySQL 3.22, 3.23, and
+4.x.
+
+Support
+-------
+Supported Platforms:
+
+  - Linux/BSD
+  - Solaris
+  - MS Windows 98/NT/2000/XP (Installer available)
+
+Connection Properties
+----------------------
+* host       -- This is the host for your connection (required)
+* dbname     -- This is the name of the database to use (required)
+
+Examples
+--------
+ [myconn]
+ provider=mysql          # Use the MySQLdb adapter
+ host=localhost          # The hostname/IP of the MySQL host
+ dbname=mydb             # The name of the MySQL database
+
+Notes
+-----
+1. Transactions are supported if MySQL is compiled with proper
+   transactional support (3.x series does NOT do this by default!).
+
+2. Windows installer available at http://www.cs.fhm.edu/~ifw00065/.
+
+3. Other than that, the driver is fully functional with no known serious
+   problems.
+"""

Deleted: trunk/gnue-common/src/datasources/drivers/oracle/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/Info.py    2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/oracle/Info.py    2005-06-17 
15:24:00 UTC (rev 7615)
@@ -1,34 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Info for this database.
-"""
-
-#
-# Documentation
-#
-name = "Oracle (7.3, 8i+)"
-url = ""
-description = """
-Oracle is a popular commercial relational database system.
-"""
-isfree = False  # Should be false for non-free DBMSs... we don't want to
-                   # show URLs for non-free on our website

Modified: trunk/gnue-common/src/datasources/drivers/oracle/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/__init__.py        
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/oracle/__init__.py        
2005-06-17 15:24:00 UTC (rev 7615)
@@ -21,3 +21,11 @@
 """
 Driver structure for Oracle databases.
 """
+
+class DriverInfo:
+  name = "Oracle (7.3, 8i+)"
+  url = ""
+  description = """
+Oracle is a popular commercial relational database system.
+"""
+  isfree = False

Deleted: trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/Info.py   
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/Info.py   
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,66 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Information on this driver
-"""
-
-#
-# Notes on this driver
-#
-name = "cx_Oracle SQLNet Driver"
-url = "http://www.computronix.com/utilities.shtml";
-doc = """
-Description
------------
-An Oracle driver from Computronix. Works with Oracle 7.3, 8.x, and 9i via
-Oracle's SQL-Net OCI interface.
-
-Support
--------
-Supported Platforms:
-
-  - Linux/BSD
-  - Solaris
-  - MS Windows 98/NT/2000/XP (Installer available)
-
-
-Connection Properties
-----------------------
-* service  -- This is the Oracle TNS connection name
-
-Examples
---------
-[myconn]
-provider=cxoracle       # Use the CX Oracle adapter
-service=mytnsname       # The TNS connection string of the database
-
-Notes
------
-1. Requires Oracle Client Libraries.
-
-2. Does not recognize the TWO_TASK environment setting.
-
-3. Creation of new databases with "gnue-schema --createdb" does not
-   work with this driver. Index introspection is not supported.
-
-4. Other than that, the driver is fully functional with no known serious
-   problems.
-"""

Modified: trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py       
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py       
2005-06-17 15:24:00 UTC (rev 7615)
@@ -40,3 +40,52 @@
     import cx_Oracle
   except ImportError:
     raise GConnections.DependencyError, ('cx_Oracle', None)
+
+
+# -----------------------------------------------------------------------------
+# Driver info
+# -----------------------------------------------------------------------------
+
+class DriverInfo:
+
+  name = "cx_Oracle SQLNet Driver"
+
+  url = "http://www.computronix.com/utilities.shtml";
+
+  doc = """
+Description
+-----------
+An Oracle driver from Computronix. Works with Oracle 7.3, 8.x, and 9i via
+Oracle's SQL-Net OCI interface.
+
+Support
+-------
+Supported Platforms:
+
+  - Linux/BSD
+  - Solaris
+  - MS Windows 98/NT/2000/XP (Installer available)
+
+
+Connection Properties
+----------------------
+* service  -- This is the Oracle TNS connection name
+
+Examples
+--------
+[myconn]
+provider=cxoracle       # Use the CX Oracle adapter
+service=mytnsname       # The TNS connection string of the database
+
+Notes
+-----
+1. Requires Oracle Client Libraries.
+
+2. Does not recognize the TWO_TASK environment setting.
+
+3. Creation of new databases with "gnue-schema --createdb" does not
+   work with this driver. Index introspection is not supported.
+
+4. Other than that, the driver is fully functional with no known serious
+   problems.
+"""

Deleted: trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/Info.py   
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/Info.py   
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,69 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Information on this driver
-"""
-
-#
-# Notes on this driver
-#
-name = "DCOracle2 OCI Driver"
-url = "http://www.zope.org/Members/matt/dco2/";
-doc = """
-Description
------------
-An Oracle driver from Digital Creations (Zope).  Works with Oracle
-7.3, 8.x, 9i via Oracle's SQL-Net OCI interface.
-
-The "Oracle Database Bindings for Python" are packaged with the
-"Zope Oracle Database Adapter". GNUe does not use the Zope
-Adapter, so you can safely ignore any installation instructions
-referring to Zope.
-
-Support
--------
-Supported Platforms:
-
-  - Linux/BSD
-  - Solaris
-  - MS Windows 98/NT/2000/XP (Installer available)
-
-Connection Properties
-----------------------
-* service  -- This is the Oracle TNS connection name
-
-Examples
---------
-provider=oracle         # Use the DCOracle2 adapter
-service=mytnsname       # The TNS connection string of the database
-
-Notes
------
-1. Requires Oracle Client Libraries.
-
-2. Does not recognize the TWO_TASK environment setting.
-
-3. Creation of new databases with "gnue-schema --createdb" does not
-   work with this driver. Index introspection is not supported
-
-4. Other than that, the driver is fully functional with no known serious
-   problems.
-"""

Modified: trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py       
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py       
2005-06-17 15:24:00 UTC (rev 7615)
@@ -40,3 +40,55 @@
     import DCOracle2
   except ImportError:
     raise GConnections.DependencyError ('DCOracle2', None)
+
+
+# -----------------------------------------------------------------------------
+# Driver info
+# -----------------------------------------------------------------------------
+
+class DriverInfo:
+
+  name = "DCOracle2 OCI Driver"
+
+  url = "http://www.zope.org/Members/matt/dco2/";
+
+  doc = """
+Description
+-----------
+An Oracle driver from Digital Creations (Zope).  Works with Oracle
+7.3, 8.x, 9i via Oracle's SQL-Net OCI interface.
+
+The "Oracle Database Bindings for Python" are packaged with the
+"Zope Oracle Database Adapter". GNUe does not use the Zope
+Adapter, so you can safely ignore any installation instructions
+referring to Zope.
+
+Support
+-------
+Supported Platforms:
+
+  - Linux/BSD
+  - Solaris
+  - MS Windows 98/NT/2000/XP (Installer available)
+
+Connection Properties
+----------------------
+* service  -- This is the Oracle TNS connection name
+
+Examples
+--------
+provider=oracle         # Use the DCOracle2 adapter
+service=mytnsname       # The TNS connection string of the database
+
+Notes
+-----
+1. Requires Oracle Client Libraries.
+
+2. Does not recognize the TWO_TASK environment setting.
+
+3. Creation of new databases with "gnue-schema --createdb" does not
+   work with this driver. Index introspection is not supported
+
+4. Other than that, the driver is fully functional with no known serious
+   problems.
+"""

Deleted: trunk/gnue-common/src/datasources/drivers/postgresql/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/Info.py        
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/Info.py        
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,41 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Info for this database.
-"""
-
-#
-# Documentation
-#
-name = "PostgreSQL (7.x+)"
-url = "http://www.postgresql.org/";
-description = """
-PostgreSQL is an free object-relational database, which supports a large part
-of SQL-99.  It is under continuous development and each release implements
-more of the SQL standard, to the extent that it is now probably more compliant
-than most commercial databases.  It also supports some object-oriented
-features. PostgreSQL is a full-featured, multi-user RDBMS that scales well
-from a few users to an entire organization.
-
-PostgreSQL is the primary database used by GNUe developers.
-"""
-isfree = True  # Should be false for non-free DBMSs... we don't want to
-                   # show URLs for non-free on our website

Modified: trunk/gnue-common/src/datasources/drivers/postgresql/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/__init__.py    
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/__init__.py    
2005-06-17 15:24:00 UTC (rev 7615)
@@ -24,3 +24,23 @@
 
 # Define alias for plugin loader
 __pluginalias__ = ['pgsql', 'postgres']
+
+
+# =============================================================================
+# Driver info
+# =============================================================================
+
+class DriverInfo:
+  name = "PostgreSQL (7.x+)"
+  url = "http://www.postgresql.org/";
+  description = """
+PostgreSQL is an free object-relational database, which supports a large part
+of SQL-99.  It is under continuous development and each release implements
+more of the SQL standard, to the extent that it is now probably more compliant
+than most commercial databases.  It also supports some object-oriented
+features. PostgreSQL is a full-featured, multi-user RDBMS that scales well
+from a few users to an entire organization.
+
+PostgreSQL is the primary database used by GNUe developers.
+"""
+  isfree = True

Deleted: trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Info.py        
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Info.py        
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,67 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Information on this driver
-"""
-
-#
-# Notes on this driver
-#
-name = "Psycopg"
-url = "http://initd.org/software/initd/psycopg/";
-doc = """
-Description
------------
-From the Psycopg website: "It was written from scratch with the aim of
-being very small and fast, and stable as a rock."  Written by initd.org
-volunteers.
-
-Support
--------
-Supported Platforms:
-
-  - Linux/BSD
-  - MS Windows 98/NT/2000/XP (Installer available)
-
-Connection Properties
----------------------
-* dbname -- This is the database to use (required)
-* host  -- This is the name of the database host, or, on Linux,
-  directory containing the network socket (optional)
-* port -- Port that PostgreSQL is running on (defaults to 5432) (optional)
-
-Examples
---------
-  [myconn]
-  provider=psycopg        # Use the psycopg adapter
-  host=localhost          # The hostname/IP of the postgresql host
-  dbname=mydb             # The name of the pg database
-
-Notes
------
-1. This is the driver of choice for PostgreSQL.
-
-2. Available in Debian as: "apt-get install python-psycopg".
-
-3. Windows installer available at: 
http://stickpeople.com/projects/python/win-psycopg/.
-
-4. This driver is fully functional with no known serious problems.
-"""

Modified: 
trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py    
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py    
2005-06-17 15:24:00 UTC (rev 7615)
@@ -40,3 +40,50 @@
     import psycopg
   except:
     raise GConnections.DependencyError, ('psycopg', None)
+
+
+# -----------------------------------------------------------------------------
+# Driver info
+# -----------------------------------------------------------------------------
+
+class DriverInfo:
+  name = "Psycopg"
+  url = "http://initd.org/software/initd/psycopg/";
+  doc = """
+Description
+-----------
+From the Psycopg website: "It was written from scratch with the aim of
+being very small and fast, and stable as a rock."  Written by initd.org
+volunteers.
+
+Support
+-------
+Supported Platforms:
+
+  - Linux/BSD
+  - MS Windows 98/NT/2000/XP (Installer available)
+
+Connection Properties
+---------------------
+* dbname -- This is the database to use (required)
+* host  -- This is the name of the database host, or, on Linux,
+  directory containing the network socket (optional)
+* port -- Port that PostgreSQL is running on (defaults to 5432) (optional)
+
+Examples
+--------
+  [myconn]
+  provider=psycopg        # Use the psycopg adapter
+  host=localhost          # The hostname/IP of the postgresql host
+  dbname=mydb             # The name of the pg database
+
+Notes
+-----
+1. This is the driver of choice for PostgreSQL.
+
+2. Available in Debian as: "apt-get install python-psycopg".
+
+3. Windows installer available at: 
http://stickpeople.com/projects/python/win-psycopg/.
+
+4. This driver is fully functional with no known serious problems.
+"""

Deleted: trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Info.py       
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Info.py       
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,60 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Information on this driver
-"""
-
-#
-# Notes on this driver
-#
-name = "PyGreSQL"
-url = "http://druid.net/pygresql/";
-doc = """
-Description
------------
-PyGreSQL is the PostgreSQL-Python driver available via PostgreSQL's CVS tree.
-It is compliant to Python's DB-API 2.0.
-
-Support
--------
-Supported Platforms:
-
-  - Linux/BSD
-
-Connection Properties
----------------------
-* dbname -- This is the database to use (required)
-* host  -- This is the name of the database host, or, on Linux,
-  directory containing the network socket (optional)
-* port -- Port that PostgreSQL is running on (defaults to 5432) (optional)
-
-Examples
---------
-  [myconn]
-  provider=pygresql       # Use the pygresql adapter
-  host=localhost          # The hostname/IP of the postgresql host
-  dbname=mydb             # The name of the pg database
-
-Notes
------
-1. The developers of GNUe have had mixed results with the PygreSQL driver
-   and generally recommend one of the others.
-"""

Modified: 
trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py   
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py   
2005-06-17 15:24:00 UTC (rev 7615)
@@ -40,3 +40,43 @@
     import pgdb
   except ImportError:
     raise GConnections.DependencyError, ('pygresql', None)
+
+
+# -----------------------------------------------------------------------------
+# Driver info
+# -----------------------------------------------------------------------------
+
+class DriverInfo:
+  name = "PyGreSQL"
+  url = "http://druid.net/pygresql/";
+  doc = """
+Description
+-----------
+PyGreSQL is the PostgreSQL-Python driver available via PostgreSQL's CVS tree.
+It is compliant to Python's DB-API 2.0.
+
+Support
+-------
+Supported Platforms:
+
+  - Linux/BSD
+
+Connection Properties
+---------------------
+* dbname -- This is the database to use (required)
+* host  -- This is the name of the database host, or, on Linux,
+  directory containing the network socket (optional)
+* port -- Port that PostgreSQL is running on (defaults to 5432) (optional)
+
+Examples
+--------
+  [myconn]
+  provider=pygresql       # Use the pygresql adapter
+  host=localhost          # The hostname/IP of the postgresql host
+  dbname=mydb             # The name of the pg database
+
+Notes
+-----
+1. The developers of GNUe have had mixed results with the PygreSQL driver
+   and generally recommend one of the others.
+"""

Deleted: trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Info.py        
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Info.py        
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,66 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Information on this driver
-"""
-
-#
-# Notes on this driver
-#
-name = "pyPgSQL"
-url = "http://pypgsql.sf.net/";
-doc = """
-Description
------------
-Written by Billy Allie, pyPgSQL is a database interface for PostgreSQL 7.x.
-
-Support
--------
-Supported Platforms:
-
-  - Linux/BSD
-  - MS Windows 98/NT/2000/XP (Installer available)
-
-Platforms Tested:
-
- - GNU/Linux [Debian 2.x, 3.x, Slackware 8.0, RedHat ]
- - Windows 98/2000/XP
-
-Connection Properties
----------------------
-* dbname -- This is the database to use (required)
-* host  -- This is the name of the database host, or, on Linux,
-  directory containing the network socket (optional)
-* port -- Port that PostgreSQL is running on (defaults to 5432) (optional)
-
-Examples
---------
-  [myconn]
-  provider=pypgsql        # Use the pypgsql adapter
-  host=localhost          # The hostname/IP of the postgresql host
-  dbname=mydb             # The name of the pg database
-
-Notes
------
-1. pyPgSQL is available in Debian as python-pgsql.
-
-2. This driver is fully functional with no known serious problems.
-"""

Modified: 
trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py    
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py    
2005-06-17 15:24:00 UTC (rev 7615)
@@ -40,3 +40,49 @@
     from pyPgSQL import PgSQL
   except:
     raise GConnections.DependencyError, ('pyPgSQL', None)
+
+
+# -----------------------------------------------------------------------------
+# Driver info
+# -----------------------------------------------------------------------------
+
+class DriverInfo:
+  name = "pyPgSQL"
+  url = "http://pypgsql.sf.net/";
+  doc = """
+Description
+-----------
+Written by Billy Allie, pyPgSQL is a database interface for PostgreSQL 7.x.
+
+Support
+-------
+Supported Platforms:
+
+  - Linux/BSD
+  - MS Windows 98/NT/2000/XP (Installer available)
+
+Platforms Tested:
+
+ - GNU/Linux [Debian 2.x, 3.x, Slackware 8.0, RedHat ]
+ - Windows 98/2000/XP
+
+Connection Properties
+---------------------
+* dbname -- This is the database to use (required)
+* host  -- This is the name of the database host, or, on Linux,
+  directory containing the network socket (optional)
+* port -- Port that PostgreSQL is running on (defaults to 5432) (optional)
+
+Examples
+--------
+  [myconn]
+  provider=pypgsql        # Use the pypgsql adapter
+  host=localhost          # The hostname/IP of the postgresql host
+  dbname=mydb             # The name of the pg database
+
+Notes
+-----
+1. pyPgSQL is available in Debian as python-pgsql.
+
+2. This driver is fully functional with no known serious problems.
+"""

Deleted: trunk/gnue-common/src/datasources/drivers/sqlite/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlite/Info.py    2005-06-17 
12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/sqlite/Info.py    2005-06-17 
15:24:00 UTC (rev 7615)
@@ -1,39 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Info for this database.
-"""
-
-#
-# Documentation
-#
-name = "SQLite Embedded Database"
-url = "http://www.sqlite.org/";
-description = """
-SQLite is a C library that implements an embeddable SQL database engine.
-Programs that link with the SQLite library can have SQL database access
-without running a separate RDBMS process.
-
-SQLite is a great database to use with GNUe for single-user installations
-where a self-contained, distributable package is desired.
-"""
-isfree = True  # Should be false for non-free DBMSs... we don't want to
-                   # show URLs for non-free on our website

Modified: trunk/gnue-common/src/datasources/drivers/sqlite/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlite/__init__.py        
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/sqlite/__init__.py        
2005-06-17 15:24:00 UTC (rev 7615)
@@ -21,3 +21,16 @@
 """
 Driver structure for SQLite databases.
 """
+
+class DriverInfo:
+  name = "SQLite Embedded Database"
+  url = "http://www.sqlite.org/";
+  description = """
+SQLite is a C library that implements an embeddable SQL database engine.
+Programs that link with the SQLite library can have SQL database access
+without running a separate RDBMS process.
+
+SQLite is a great database to use with GNUe for single-user installations
+where a self-contained, distributable package is desired.
+"""
+  isfree = True

Deleted: trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Info.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Info.py     
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Info.py     
2005-06-17 15:24:00 UTC (rev 7615)
@@ -1,63 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-"""
-Information on this driver
-"""
-
-#
-# Notes on this driver
-#
-name = "PySQLite Driver"
-url = "http://pysqlite.sourceforge.net/";
-doc = """
-Description
------------
-PySQLite is a Python extension for SQLite that conforms to the Python
-Database API Specification 2.0. The source is released under the
-Python license.
-
-Support
--------
-Supported Platforms:
-
-  - Linux/BSD
-  - Solaris
-  - MS Windows 98/NT/2000/XP
-
-Connection Properties
----------------------
-* dbname     -- This is the file name of the sqlite database (required)
-
-Examples
---------
-[myconn]
-provider=sqlite         # Use the SQLite adapter
-dbname=/usr/db/testdb   # The filename for the SQLite database
-
-Notes
------
-1. The database engine stores all data in string format. Many
-   SQL statements won't work. Comparison of date types won't work
-   correctly, etc.
-
-2. Other than that, this driver is fully functional without any serious
-   known problems.
-"""

Modified: trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py 
2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py 
2005-06-17 15:24:00 UTC (rev 7615)
@@ -49,3 +49,49 @@
 
   except ImportError:
     raise GConnections.DependencyError, ('SQLitedbapi', None)
+
+
+# -----------------------------------------------------------------------------
+# Driver info
+# -----------------------------------------------------------------------------
+
+class DriverInfo:
+
+  name = "PySQLite Driver"
+
+  url = "http://pysqlite.sourceforge.net/";
+
+  doc = """
+Description
+-----------
+PySQLite is a Python extension for SQLite that conforms to the Python
+Database API Specification 2.0. The source is released under the
+Python license.
+
+Support
+-------
+Supported Platforms:
+
+  - Linux/BSD
+  - Solaris
+  - MS Windows 98/NT/2000/XP
+
+Connection Properties
+---------------------
+* dbname     -- This is the file name of the sqlite database (required)
+
+Examples
+--------
+[myconn]
+provider=sqlite         # Use the SQLite adapter
+dbname=/usr/db/testdb   # The filename for the SQLite database
+
+Notes
+-----
+1. The database engine stores all data in string format. Many
+   SQL statements won't work. Comparison of date types won't work
+   correctly, etc.
+
+2. Other than that, this driver is fully functional without any serious
+   known problems.
+"""

Modified: trunk/gnue-common/utils/helpers/info.py
===================================================================
--- trunk/gnue-common/utils/helpers/info.py     2005-06-17 12:51:30 UTC (rev 
7614)
+++ trunk/gnue-common/utils/helpers/info.py     2005-06-17 15:24:00 UTC (rev 
7615)
@@ -8,9 +8,26 @@
 ##
 
 class Info:
-  def __init__(self, name, info):
+  def __init__(self, path, info):
+    self.path = path
+    self.name = path.split ('.') [-1]
     self._info = info
-    self.name = name
+    self.fullname = self.get ('name')
+    if '(' in self.fullname:
+      (n1, n2) = self.fullname.split ('(', 1)
+      self.shortname = n1.strip ()
+      self.extraname = ' (' + n2
+    else:
+      self.shortname = self.fullname
+      self.extraname = ''
+    self.__subinfos = {}
+    for (path, module) in \
+        (plugin.list (self.path, 'DriverInfo', False)).items ():
+      if isinstance (module, tuple):
+        # error has occured in importing the module
+        print path + ':' + module [1]
+      else:
+        self.__subinfos [path] = Info (path, module.DriverInfo)
 
   def get(self, tag, default=""):
     try:
@@ -24,66 +41,31 @@
   def subheaded(self, tag, default=""):
     return SubheadedFile(StringIO(self.get(tag, default)), self.name + ': %s' 
% tag)
 
+  def getSubinfos (self):
+    keys = self.__subinfos.keys ()
+    keys.sort ()
+    return [self.__subinfos [k] for k in keys ]
 
-class DatasourceInfo:
-  def __init__(self):
-    m = importModule('common','src/datasources', 'drivers')
+  def asText (self):
+    result = ''
+    if self._info:
+      result += '* ' + self.get ('name') + '\n'
+    if self.__subinfos:
+      subinfos = []
+      for i in self.getSubinfos ():
+        subinfos += (i.asText ()).split ('\n')
+      result += '\n'.join (['  ' + l for l in subinfos if len (l) > 0])
+    return result
 
-    vendorDbMap = {}
-    for (name, result) in (plugin.list ('gnue.common.datasources.drivers', 
'Connection')).items ():
-      first, second = name.split('.')[4:6]
-      try:
-        dm = vendorDbMap[first]
-      except KeyError:
-        dm = vendorDbMap[first] = []
-      dm.append(second)
 
-    vendors = vendorDbMap.keys()
-    aliases = []  # TODO
+def DatasourceInfo ():
+  return Info ('gnue.common.datasources.drivers', None)
 
-    self.vendorMap = vendorMap = {}
 
-    for vendor in vendors:
-      drivers = vendorDbMap[vendor]
+# =============================================================================
+# Self test code
+# =============================================================================
 
-      try:
-        dbinfo = Info(vendor, 
importModule('common','src/datasources/drivers/%s' % vendor,'Info'))
-      except ImportError:
-        print "WARNING: common/datasources/drivers/%s has no Info.py" % vendor
-        continue
-
-      dbname = dbinfo.get('name')
-      if not dbname:
-        print "WARNING: top-level datasource %s has no name in Info.py" % 
vendor
-        dbname = vendor
-
-      driverMap = {}
-      vendorMap[dbname] = [dbinfo, driverMap]
-      for driver in drivers:
-        try:
-          dinfo = Info(driver, 
importModule('common','src/datasources/drivers/%s/%s' % (vendor,driver),'Info'))
-        except ImportError:
-          print "WARNING: common/datasources/drivers/%s/%s has no Info.py" % 
(vendor, driver)
-          continue
-
-        dname = dinfo.get('name')
-        if not dname:
-          print "WARNING: datasource driver %s.%s has no name in Info.py" % 
(vendor, driver)
-          dname = driver
-
-        if driverMap.has_key(dname):
-          print "WARNING: datasource driver %s.%s has a duplicate name of %s" 
% (vendor, driver, driverMap[dname].name)
-
-        driverMap[dname] = dinfo
-
-  def asHTML(self):
-    for dbname, stuff in self.vendorMap.items():
-      dbinfo, driverMap = stuff
-      if dbinfo.bool('isfree') and dbinfo.get('url'):
-        if '(' in dbname:
-          f, l = dbname.split('(',1)
-          print '<a href="%s">%s</a> (%s' % (dbinfo.get('url'), f.strip(),l)
-        else:
-          print '<a href="%s">%s</a>' % (dbinfo.get('url'), dbname)
-      else:
-        print dbname
+if __name__ == '__main__':
+  for info in DatasourceInfo ().getSubinfos ():
+    print info.asText ()

Modified: trunk/www/utils/webhelpers/tools.py
===================================================================
--- trunk/www/utils/webhelpers/tools.py 2005-06-17 12:51:30 UTC (rev 7614)
+++ trunk/www/utils/webhelpers/tools.py 2005-06-17 15:24:00 UTC (rev 7615)
@@ -350,103 +350,129 @@
   ##
   # Write out tool/common/databases/ home page
   #
-  dinfo = DatasourceInfo()
-  html = "<h1>Supported Databases</h1>\n"
-  html += "<p>The following databases are at least partially supported by GNUe 
Common and the GNUe tools.</p><ul>"
-  sortable = []
+  html  = "<h1>Supported Databases</h1>\n"
+  html += "\n"
+  html += "<p>\n"
+  html += "  The following databases are at least partially supported\n"
+  html += "  by GNUe Common and the GNUe tools.\n"
+  html += "</p>\n"
+  html += "\n"
+  html += "<ul>\n"
+  for info in (DatasourceInfo ()).getSubinfos ():
+    html += __processInfo (info)
+  html += "</ul>\n"
+  phpWrapper('tools/common/databases/index.php',html,'Supported Databases')
 
-  for dbname, stuff in dinfo.vendorMap.items():
-    dbinfo, driverMap = stuff
-    if '(' in dbname:
-      f, l = dbname.split('(',1)
-      shortname = f.strip()
-      h = '<li><a href="%s.php">%s</a> (%s</li>' % (dbinfo.name, f.strip(),l)
-    else:
-      shortname = dbname
-      h= '<li><a href="%s.php">%s</a></li>' % (dbinfo.name, dbname)
-    sortable.append((dbname.lower(),h))
 
-    # Create individual page for each datadriver
-    html2 = "<h1>"
+# =============================================================================
+# Helper functions for database info HTML creation
+# =============================================================================
 
-    if dbinfo.bool('isfree') and dbinfo.get('url'):
-      if '(' in dbname:
-        html2 += '<a href="%s">%s</a> (%s</h1>' % (dbinfo.get('url'), 
f.strip(),l)
-      else:
-        html2 += '<a href="%s">%s</a></h1>' % (dbinfo.get('url'), dbname)
-    else:
-      html2 += "%s</h1>" % dbname
+# -----------------------------------------------------------------------------
+# Process an DriverInfo node
+# -----------------------------------------------------------------------------
 
+def __processInfo (info):
 
-    html2 += htmlify(dbinfo.get('description','No description was provided for 
this database/connection type.'), 'datasources/%s/Info.py: description' % 
dbinfo.name)
+  if info.get ('description'):
+    html = '  <li><a href="%s.php">%s</a>%s</li>\n' % (info.name,
+        info.shortname, info.extraname)
+    __writeFile (info)
+  else:
+    html  = '  <li>\n'
+    html += '    ' + info.fullname + '\n'
+    html += '    <ul>\n'
+    lines = []
+    for i in info.getSubinfos ():
+      lines += (__processInfo (i)).split ('\n')
+    html += '\n'.join (['    ' + l for l in lines if len (l) > 0]) + '\n'
+    html += '    </ul>\n'
+    html += '  </li>\n'
+  return html
 
-    html2 += "\n<p>To utilize %s within GNUe, you must use one of the 
following python drivers:</p>\n<ul>" % shortname
 
+# -----------------------------------------------------------------------------
+# Write the separate file for a DB vendor
+# -----------------------------------------------------------------------------
+
+def __writeFile (dbinfo):
+
+  html2 = "<h1>"
+
+  if dbinfo.bool ('isfree') and dbinfo.get ('url'):
+    html2 += '<a href="%s">%s</a>%s</h1>\n' % (dbinfo.get ('url'),
+        dbinfo.shortname, dbinfo.extraname)
+  else:
+    html2 += "%s</h1>\n" % dbinfo.fullname
+
+  html2 += htmlify (dbinfo.get ('description',
+          'No description was provided for this database/connection type.'),
+      dbinfo.path)
+
+  drivers = dbinfo.getSubinfos ()
+
+  if drivers:
+    html2 += "\n<p>To utilize %s within GNUe, you must use one of the 
following python drivers:</p>\n<ul>" % dbinfo.shortname
+
     sort2 = []
-    for dr, db in driverMap.items():
-      sort2.append((dr.lower(), dr, db))
+    for driverinfo in dbinfo.getSubinfos ():
+      sort2.append((driverinfo.name, driverinfo))
     sort2.sort()
 
     html3 = ""
-    for foo, drname, drinfo in sort2:
-      html2 += '<li><a href="#%s">%s</a></li>\n' % (drinfo.name, drname)
-      html3 += '<h2><a name="%s">%s</a></h2>\n' % (drinfo.name, drname)
-      url = drinfo.get('url')
+    for foo, drinfo in sort2:
+      html2 += '<li><a href="#%s">%s</a></li>\n' % (drinfo.name, 
drinfo.fullname)
+      html3 += '<h2><a name="%s">%s</a></h2>\n' % (drinfo.name, 
drinfo.fullname)
+      html3 += __driverInfo (drinfo)
 
-      sh = drinfo.subheaded('doc')
-      if sh.sections[None]:
-        html3 += sh.asHTML(None)
+  elif dbinfo.get ('doc'):
+    html3 = __driverInfo (dbinfo)
 
-      html3 += sh.asHTML('Description', 'No description was provided for 
driver.')
+  html2 += '</ul>\n\n' + html3
 
-      html3 += '<!-- div class="indent" -->'
-      if url:
-        html3 += '<p>Home Page: <a href="%s">%s</a></p>' % (url, url)
-      else:
-        html3 += '<p>Home Page: <i>n/a</i></p>'
+  phpWrapper('tools/common/databases/%s.php' % dbinfo.name, html2,
+             'Support for %s' % dbinfo.shortname)
 
-      if sh.asText('Support',''):
-        html3 += sh.asHTML('Support')
 
-      html3 += '<!-- /div -->'
+# -----------------------------------------------------------------------------
+# Generate HTML code for a specific driver
+# -----------------------------------------------------------------------------
 
-      for sec in sh.sectionOrder:
-        if sec.upper() in ('DESCRIPTION','SUPPORT'):
-          continue
-        html3 += '<h3>%s</h3>\n' % sec
-        if sec.upper() == 'EXAMPLES':
-          html3 += "<p>The following is an example of a connection.conf 
entry:</p>\n" + sh.asPreHTML(sec)
-        elif sec.upper() == 'CONNECTION PROPERTIES':
-          html3 += "<p>The following properties can be specified in your 
connections.conf file:</p>\n"
-          ht = sh.asHTML(sec)
-          for line in ht.split('\n'):
-            if '--' in line and '<li>' in line:
-              line = line.replace('--','</b> 
--').replace('<li>','<li><b>').replace('<b> ','<b>')
-            html3 += line + '\n'
-        else:
-          html3 += sh.asHTML(sec)
+def __driverInfo (drinfo):
+  html3 = ''
+  url = drinfo.get('url')
 
+  sh = drinfo.subheaded('doc')
+  if sh.sections[None]:
+    html3 += sh.asHTML(None)
 
-    html2 += '</ul>\n\n' + html3
+  html3 += sh.asHTML('Description', 'No description was provided for driver.')
 
-    phpWrapper('tools/common/databases/%s.php' % dbinfo.name,html2,
-               'Support for %s'%shortname)
+  html3 += '<!-- div class="indent" -->'
+  if url:
+    html3 += '<p>Home Page: <a href="%s">%s</a></p>' % (url, url)
+  else:
+    html3 += '<p>Home Page: <i>n/a</i></p>'
 
-  # write database home page
-  sortable.sort()
-  for dbname, h in sortable:
-    html += h + '\n'
+  if sh.asText('Support',''):
+    html3 += sh.asHTML('Support')
 
-  html += "</ul>"
+  html3 += '<!-- /div -->'
 
-  phpWrapper('tools/common/databases/index.php',html,'Supported Databases')
+  for sec in sh.sectionOrder:
+    if sec.upper() in ('DESCRIPTION','SUPPORT'):
+      continue
+    html3 += '<h3>%s</h3>\n' % sec
+    if sec.upper() == 'EXAMPLES':
+      html3 += "<p>The following is an example of a connection.conf 
entry:</p>\n" + sh.asPreHTML(sec)
+    elif sec.upper() == 'CONNECTION PROPERTIES':
+      html3 += "<p>The following properties can be specified in your 
connections.conf file:</p>\n"
+      ht = sh.asHTML(sec)
+      for line in ht.split('\n'):
+        if '--' in line and '<li>' in line:
+          line = line.replace('--','</b> 
--').replace('<li>','<li><b>').replace('<b> ','<b>')
+        html3 += line + '\n'
+    else:
+      html3 += sh.asHTML(sec)
 
-#    if dbinfo.bool('isfree') and dbinfo.get('url'):
-#      if '(' in dbname:
-#        f, l = dbname.split('(',1)
-#        h = '<li><a href="%s">%s</a> (%s</li>' % (dbinfo.get('url'), 
f.strip(),l)
-#      else:
-#        h= '<li><a href="%s">%s</a></li>' % (dbinfo.get('url'), dbname)
-#    else:
-#      h = "<li>%s</li>" % dbname
-
+  return html3





reply via email to

[Prev in Thread] Current Thread [Next in Thread]