r6298 - in trunk/gnue-common: . packaging/win32 scripts src/schema src/schema/scripter utils

[johannes]

Author: johannes
Date: 2004-09-16 08:13:49 -0500 (Thu, 16 Sep 2004)
New Revision: 6298

Removed:
   trunk/gnue-common/scripts/gnue-import
   trunk/gnue-common/src/schema/importer/
Modified:
   trunk/gnue-common/NEWS
   trunk/gnue-common/packaging/win32/GNUe-Common-debug.iss
   trunk/gnue-common/packaging/win32/GNUe-Common.iss
   trunk/gnue-common/packaging/win32/setup.py
   trunk/gnue-common/setup.cvs
   trunk/gnue-common/setup.py
   trunk/gnue-common/src/schema/scripter/Scripter.py
   trunk/gnue-common/utils/update-tool-docs
Log:
*) Removed gnue-import since it's features are handled by gnue-schema
*) gnue-schema now takes care of username/password given in connections.conf
*) gnue-schema uses 'gnue' as default-connection if no connection is given


Modified: trunk/gnue-common/NEWS
===================================================================
--- trunk/gnue-common/NEWS      2004-09-16 12:23:37 UTC (rev 6297)
+++ trunk/gnue-common/NEWS      2004-09-16 13:13:49 UTC (rev 6298)
@@ -32,7 +32,6 @@
 o Improved code (trigger/procedures) interface
 o Restructured datasource interface
 o Much improved gnue-schema program
-o New gnue-import program to merge data from .gsd files into a running database
 o Misc bug fixes
 
 New features/changes in version 0.5.2: (2003-10-22)

Modified: trunk/gnue-common/packaging/win32/GNUe-Common-debug.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Common-debug.iss     2004-09-16 
12:23:37 UTC (rev 6297)
+++ trunk/gnue-common/packaging/win32/GNUe-Common-debug.iss     2004-09-16 
13:13:49 UTC (rev 6298)
@@ -28,7 +28,6 @@
 Name: translations; Description: Translations; Types: full
 
 [Files]
-Source: c:\gnue\bin\gnue-import.exe; DestDir: {app}\bin; Components: main; 
Flags: ignoreversion
 Source: c:\gnue\bin\gnue-schema.exe; DestDir: {app}\bin; Components: main; 
Flags: ignoreversion
 Source: c:\gnue\bin\gnue\*.*; DestDir: {app}\bin\gnue; Components: main; 
Flags: ignoreversion
 Source: c:\gnue\bin\gnue\common\*.*; DestDir: {app}\bin\gnue\common; Flags: 
recursesubdirs ignoreversion; Components: main

Modified: trunk/gnue-common/packaging/win32/GNUe-Common.iss
===================================================================
--- trunk/gnue-common/packaging/win32/GNUe-Common.iss   2004-09-16 12:23:37 UTC 
(rev 6297)
+++ trunk/gnue-common/packaging/win32/GNUe-Common.iss   2004-09-16 13:13:49 UTC 
(rev 6298)
@@ -28,7 +28,6 @@
 Name: translations; Description: Translations; Types: full
 
 [Files]
-Source: c:\gnue\bin\gnue-import.exe; DestDir: {app}\bin; Components: main; 
Flags: ignoreversion
 Source: c:\gnue\bin\gnue-schema.exe; DestDir: {app}\bin; Components: main; 
Flags: ignoreversion
 Source: c:\gnue\bin\gnue\*.*; DestDir: {app}\bin\gnue; Components: main; 
Flags: ignoreversion
 Source: c:\gnue\bin\gnue\common\*.*; DestDir: {app}\bin\gnue\common; Flags: 
recursesubdirs ignoreversion; Components: main

Modified: trunk/gnue-common/packaging/win32/setup.py
===================================================================
--- trunk/gnue-common/packaging/win32/setup.py  2004-09-16 12:23:37 UTC (rev 
6297)
+++ trunk/gnue-common/packaging/win32/setup.py  2004-09-16 13:13:49 UTC (rev 
6298)
@@ -12,7 +12,6 @@
            "gnue-gsdgen",
            "gnue-gcd2sql",
            "gnue-readgld",
-           "gnue-import",
            "gnue-navigator",
            "gnue-reports",
            "gnue-reports-server",

Deleted: trunk/gnue-common/scripts/gnue-import
===================================================================
--- trunk/gnue-common/scripts/gnue-import       2004-09-16 12:23:37 UTC (rev 
6297)
+++ trunk/gnue-common/scripts/gnue-import       2004-09-16 13:13:49 UTC (rev 
6298)
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2001-2003 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$
-
-import os, sys
-if hasattr(sys, 'frozen'):
-  sys.path.append(os.path.abspath(os.path.dirname(sys.argv[0])))
-
-from gnue.common.schema.importer.Importer import Importer
-
-if __name__ == "__main__":
-  Importer ().run ()

Modified: trunk/gnue-common/setup.cvs
===================================================================
--- trunk/gnue-common/setup.cvs 2004-09-16 12:23:37 UTC (rev 6297)
+++ trunk/gnue-common/setup.cvs 2004-09-16 13:13:49 UTC (rev 6298)
@@ -28,7 +28,6 @@
 
 #createShell ('grpcdoc','common/rpc/drivers/_helpers/RpcDoc.py')
 createShell ('gsscvs', 'gnue-schema')
-createShell ('gimcvs', 'gnue-import')
 createShell ('gcvs','')
 #createShell ('gdtdcvs','common/.GDTD.py')
 #createShell ('gtestcvs','common/GTest.py')

Modified: trunk/gnue-common/setup.py
===================================================================
--- trunk/gnue-common/setup.py  2004-09-16 12:23:37 UTC (rev 6297)
+++ trunk/gnue-common/setup.py  2004-09-16 13:13:49 UTC (rev 6298)
@@ -56,8 +56,7 @@
   # The Programs
   params ["package_dir"] = {"gnue":        "module/base",
                             "gnue.common": "src"}
-  params ["scripts"] = ["scripts/gnue-schema",
-                        "scripts/gnue-import"]
+  params ["scripts"] = ["scripts/gnue-schema"]
 
   # The Data
   # TODO: get rid of setupext!

Modified: trunk/gnue-common/src/schema/scripter/Scripter.py
===================================================================
--- trunk/gnue-common/src/schema/scripter/Scripter.py   2004-09-16 12:23:37 UTC 
(rev 6297)
+++ trunk/gnue-common/src/schema/scripter/Scripter.py   2004-09-16 13:13:49 UTC 
(rev 6298)
@@ -68,6 +68,7 @@
 
   def __init__ (self, connections = None):
     self.addCommandOption ('connection', 'c', argument='connectionname',
+        default = "gnue",
         help = _("Use the connection <connectionname> for creating the 
schema"))
 
     self.addCommandOption ('output','o', argument='filename',
@@ -175,9 +176,6 @@
       self.handleStartupError (u_("Unable to open input file %s.") % filename)
 
 
-    if not self.OPTIONS ['connection']:
-      self.handleStartupError (_("No connection specified."))
-
     self.outfile = self.OPTIONS ['output']
 
     if self.OPTIONS ['file-only'] and self.outfile is None:
@@ -198,9 +196,15 @@
     # if a username is given on the command line we pass both username and
     # password to the connection parameters. If the password is not set, it
     # defaults to an empty string.
-    username = self.OPTIONS ['username'] or 'gnue'
-    password = self.OPTIONS ['password'] or 'gnue'
+    username = self.connection.parameters.get ('username', 'gnue')
+    password = self.connection.parameters.get ('password', 'gnue')
 
+    if self.OPTIONS ['username'] is not None:
+      username = self.OPTIONS ['username']
+
+    if self.OPTIONS ['password'] is not None:
+      password = self.OPTIONS ['password']
+
     self.connection.parameters ['username'] = username
     self.connection.parameters ['password'] = password
 

Modified: trunk/gnue-common/utils/update-tool-docs
===================================================================
--- trunk/gnue-common/utils/update-tool-docs    2004-09-16 12:23:37 UTC (rev 
6297)
+++ trunk/gnue-common/utils/update-tool-docs    2004-09-16 13:13:49 UTC (rev 
6298)
@@ -20,7 +20,6 @@
 # Schema
 gcvs $GDTD schema    gnue-common/doc/gnue-schema.dtd
 (cd gnue-common/doc/man && gsscvs --selfdoc manpage --selfdoc-file 
gnue-schema.1)
-(cd gnue-common/doc/man && gimcvs --selfdoc manpage --selfdoc-file 
gnue-import.1)
 
 # Designer
 (cd gnue-designer/doc/man && gdes --selfdoc manpage --selfdoc-file 
gnue-designer.1)