[gnue] r6995 - trunk/gnue-appserver/src

[johannes]

Author: johannes
Date: 2005-02-11 04:46:57 -0600 (Fri, 11 Feb 2005)
New Revision: 6995

Modified:
   trunk/gnue-appserver/src/geasConfiguration.py
   trunk/gnue-appserver/src/geasGsdGen.py
   trunk/gnue-appserver/src/geasRpcServer.py
   trunk/gnue-appserver/src/geasSession.py
   trunk/gnue-appserver/src/geasSessionManager.py
Log:
Added '--connection' option to appserver and gnue-gsdgen and made '--database' 
to be depreciated (but still working)


Modified: trunk/gnue-appserver/src/geasConfiguration.py
===================================================================
--- trunk/gnue-appserver/src/geasConfiguration.py       2005-02-11 10:01:39 UTC 
(rev 6994)
+++ trunk/gnue-appserver/src/geasConfiguration.py       2005-02-11 10:46:57 UTC 
(rev 6995)
@@ -31,9 +31,18 @@
 
   { 'Name'       : 'database',
     'Type'       : 'Setting',
-    'Comment'    : _('Name of the database connection appserver is using'),
-    'Description': _('Name of the database connection appserver is using'),
+    'Comment'    : _("Depreciated: Name of the database connection appserver "
+                     "is using. Use connection instead."),
+    'Description': _("Depreciated: Name of the database connection appserver "
+                     "is using. Use connection instead."),
     'Typecast'   : GTypecast.text,
+    'Default'    : ''},
+
+  { 'Name'       : 'connection',
+    'Type'       : 'Setting',
+    'Comment'    : _("Name of the database connection appserver is using"),
+    'Description': _("Name of the database connection appserver is using"),
+    'Typecast'   : GTypecast.text,
     'Default'    : 'gnue' },
 
   { 'Name'       : 'rpctype',

Modified: trunk/gnue-appserver/src/geasGsdGen.py
===================================================================
--- trunk/gnue-appserver/src/geasGsdGen.py      2005-02-11 10:01:39 UTC (rev 
6994)
+++ trunk/gnue-appserver/src/geasGsdGen.py      2005-02-11 10:46:57 UTC (rev 
6995)
@@ -79,9 +79,13 @@
   def __init__ (self, connections = None):
 
     self.addCommandOption ('database', 'd', argument = 'database',
-        help = _("Set the Database to use for data to <name>. gnue-appserver "
-                 "will search for it in connections.conf."))
+        help = _("Depreciated: Set the Database to use for data to <name>. "
+                 "gnue-appserver will search for it in connections.conf. "
+                 "Use '--connection' instead."))
 
+    self.addCommandOption ('connection', 'c', argument = 'connectionname',
+        help = _("Use the connection <connectionname> for data retrieval."))
+
     self.addCommandOption ('output', 'o', argument = 'file',
         help = _("Name of the resulting gsd-file"))
 
@@ -102,8 +106,23 @@
     cparser = self.configurationManager._loadedConfigs ['gnue.conf']
 
     if self.OPTIONS ["database"] is not None:
-      cparser.set ('appserver', 'database', self.OPTIONS ["database"])
+      gDebug (1, "DEPRECIATION WARNING: use of 'database' option is "
+                 "depreciated. Use '--connection' instead.")
+      cparser.set ('appserver', 'connection', self.OPTIONS ["database"])
 
+    else:
+      dbName = cparser.get ('appserver', 'database')
+      coName = cparser.get ('appserver', 'connection')
+
+      # if there is a 'database' entry set and the 'connection' entry is either
+      # default or not set (which is the same) we use the 'database' specified
+      # NOTE: this could be removed as soon as 'database' is no longer 
supported
+      if dbName and coName == 'gnue':
+        cparser.set ('appserver', 'connection', dbName)
+
+    if self.OPTIONS ["connection"] is not None:
+      cparser.set ('appserver', 'connection', self.OPTIONS ['connection'])
+
     self.__filterParams = self.__getFilterParams ()
     self.__useFilter    = False
 

Modified: trunk/gnue-appserver/src/geasRpcServer.py
===================================================================
--- trunk/gnue-appserver/src/geasRpcServer.py   2005-02-11 10:01:39 UTC (rev 
6994)
+++ trunk/gnue-appserver/src/geasRpcServer.py   2005-02-11 10:46:57 UTC (rev 
6995)
@@ -69,6 +69,10 @@
 common/doc/RPC-abstraction.""")],
 
     ['database', None, 'database', 1, None, 'name', _(
+"""Depreciated: Set the Database to use for loading and storing data to <name>.
+gnue-appserver will search for it in connections.conf.""")],
+
+    ['connection', 'c', 'connection', 1, None, 'name', _(
 """Set the Database to use for loading and storing data to <name>.
 gnue-appserver will search for it in connections.conf.""")],
 
@@ -108,15 +112,33 @@
     # overwrite configuration settings by command line parameters
     cparser = self.configurationManager._loadedConfigs ['gnue.conf']
 
-    if self.OPTIONS ["rpctype"] != None:
+    if self.OPTIONS ["rpctype"] is not None:
       cparser.set ('appserver', 'rpctype', self.OPTIONS ["rpctype"])
 
-    if self.OPTIONS ["rpcport"] != None:
+    if self.OPTIONS ["rpcport"] is not None:
       cparser.set ('appserver', 'rpcport', self.OPTIONS ["rpcport"])
 
-    if self.OPTIONS["database"] != None:
-      cparser.set ('appserver', 'database', self.OPTIONS ["database"])
+    if self.OPTIONS ["database"] is not None:
+      gDebug (1, "DEPRECIATION WARNING: use of 'database' option is "
+                 "depreciated. Please use 'connection' instead.")
+      cparser.set ('appserver', 'connection', self.OPTIONS ["database"])
+    else:
+      # do we have a 'database' entry in gnue.conf ?
+      dbName  = cparser.get ('appserver', 'database')
+      coName = cparser.get ('appserver', 'connection')
 
+      # if there is a 'database' entry set and the 'connection' entry is either
+      # default or not set (which is the same) we use the 'database' specified
+      if dbName and coName == 'gnue':
+        print "Moving db to connection", dbName
+        cparser.set ('appserver', 'connection', dbName)
+      else:
+        print "leaving", dbName, "for sake of", coName
+
+    if self.OPTIONS ['connection'] is not None:
+      print "Using connection-argument"
+      cparser.set ('appserver', 'connection', self.OPTIONS ['connection'])
+
     if self.OPTIONS ["modulepath"] is not None:
       cparser.set ('appserver', 'modulepath', self.OPTIONS ['modulepath'])
 

Modified: trunk/gnue-appserver/src/geasSession.py
===================================================================
--- trunk/gnue-appserver/src/geasSession.py     2005-02-11 10:01:39 UTC (rev 
6994)
+++ trunk/gnue-appserver/src/geasSession.py     2005-02-11 10:46:57 UTC (rev 
6995)
@@ -102,7 +102,7 @@
     self.loggedIn = 0
     self.connections = connections
     try:
-      self.database = gConfig('database')
+      self.database = gConfig ('connection')
     except:
       self.database = "gnue"
 

Modified: trunk/gnue-appserver/src/geasSessionManager.py
===================================================================
--- trunk/gnue-appserver/src/geasSessionManager.py      2005-02-11 10:01:39 UTC 
(rev 6994)
+++ trunk/gnue-appserver/src/geasSessionManager.py      2005-02-11 10:46:57 UTC 
(rev 6995)
@@ -78,6 +78,7 @@
 
     self._langRuntimes = {}
 
+
   # ---------------------------------------------------------------------------
   # Build an internal session
   # ---------------------------------------------------------------------------
@@ -115,7 +116,7 @@
 
       if len (gcd):
         reader = readgcd.gcdReader (self._connections,
-                                    gConfig ('database'), gcd)
+                                    gConfig ('connection'), gcd)
         reader.run ()
 
         modRS = reader.moduleRS
@@ -127,7 +128,7 @@
 
       if len (gld):
         reader = readgld.gldReader (self._connections,
-                                    gConfig ('database'), gld,
+                                    gConfig ('connection'), gld,
                                     modRS, clsRS, prpRS, prcRS)
         reader.run ()