[gnue] r6998 - in trunk/gnue-appserver/src: gcd gld

[johannes]

Author: johannes
Date: 2005-02-11 05:06:42 -0600 (Fri, 11 Feb 2005)
New Revision: 6998

Modified:
   trunk/gnue-appserver/src/gcd/readgcd.py
   trunk/gnue-appserver/src/gld/readgld.py
Log:
Fixed handling of --connection (using proper config-settings)


Modified: trunk/gnue-appserver/src/gcd/readgcd.py
===================================================================
--- trunk/gnue-appserver/src/gcd/readgcd.py     2005-02-11 10:56:57 UTC (rev 
6997)
+++ trunk/gnue-appserver/src/gcd/readgcd.py     2005-02-11 11:06:42 UTC (rev 
6998)
@@ -119,7 +119,6 @@
   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',
@@ -140,8 +139,20 @@
 
     GClientApp.__init__ (self, connections, 'appserver', ConfigOptions)
 
+    if self.OPTIONS ['connection']:
+      self._connection = self.OPTIONS ['connection']
+    else:
+      # Compatibility for 'database' setting in gnue.conf
+      dbName = gConfig ('database')
+      coName = gConfig ('connection')
 
+      if dbName and coName == 'gnue':
+        self._connection = dbName
+      else:
+        self._connection = coName
 
+
+
   # ---------------------------------------------------------------------------
   # Main program
   # ---------------------------------------------------------------------------
@@ -153,7 +164,7 @@
     """
 
     reader = gcdReader (self.connections,
-                        self.OPTIONS ['connection'],
+                        self._connection,
                         [unicode (a, i18n.encoding) for a in self.ARGUMENTS],
                         self.OPTIONS ['output'],
                         self.OPTIONS ['file-only'])
@@ -173,7 +184,7 @@
     password set.
     """
 
-    connection = self.connections.getConnection (self.OPTIONS ['connection'])
+    connection = self.connections.getConnection (self._connection)
 
     if not connection.parameters.has_key ('username'):
       connection.parameters ['username'] = 'gnue'
@@ -1119,7 +1130,7 @@
     """
 
     if self._uuidType == 'time':
-      return UUID.generateTimeBase ()
+      return UUID.generateTimeBased ()
     else:
       return UUID.generateRandom ()
 

Modified: trunk/gnue-appserver/src/gld/readgld.py
===================================================================
--- trunk/gnue-appserver/src/gld/readgld.py     2005-02-11 10:56:57 UTC (rev 
6997)
+++ trunk/gnue-appserver/src/gld/readgld.py     2005-02-11 11:06:42 UTC (rev 
6998)
@@ -99,7 +99,6 @@
   def __init__ (self, connections = None):
 
     self.addCommandOption ('connection', 'c', argument='connectionname',
-        default = "gnue",
         help = _("Use the connection <connectionname> for creating the 
schema"))
 
     self.addCommandOption ('username', 'u', argument="user",
@@ -114,7 +113,19 @@
     GClientApp.GClientApp.__init__ (self, connections, 'appserver',
         ConfigOptions)
 
+    if self.OPTIONS ['connection']:
+      self._connection = self.OPTIONS ['connection']
+    else:
+      # Compatibility for 'database' setting in gnue.conf
+      dbName = gConfig ('database')
+      coName = gConfig ('connection')
 
+      if dbName and coName == 'gnue':
+        self._connection = dbName
+      else:
+        self._connection = coName
+
+
   # ---------------------------------------------------------------------------
   # Main program
   # ---------------------------------------------------------------------------
@@ -127,7 +138,7 @@
     """
 
     reader = gldReader (self.connections,
-                        self.OPTIONS ['connection'],
+                        self._connection,
                         [unicode (a, i18n.encoding) for a in self.ARGUMENTS])
 
     self._prepareConnection ()
@@ -145,7 +156,7 @@
     password set.
     """
 
-    connection = self.connections.getConnection (self.OPTIONS ['connection'])
+    connection = self.connections.getConnection (self._connection)
 
     if not connection.parameters.has_key ('username'):
       connection.parameters ['username'] = 'gnue'