Changeset 800 for pykota/trunk/pykota/storage.py

Timestamp:

02/17/03 23:06:07 (22 years ago)

Author:

jalet

Message:

Storage backend now supports admin and user passwords (untested)

Files:

• pykota/trunk/pykota/storage.py (modified) (3 diffs)

pykota/trunk/pykota/storage.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.8  2003/02/17 22:05:50  jalet
+# Storage backend now supports admin and user passwords (untested)
+#
 # Revision 1.7  2003/02/10 12:07:31  jalet
 # Now repykota should output the recorded total page number for each printer too.
@@ -109 +112 @@
     """Returns a connection handle to the appropriate Quota Storage Database."""
     (backend, host, database, admin, user) = config.getStorageBackend()
+    backendinfo = config.getStorageBackend()
+    backend = backendinfo["storagebackend"]
     try :
         if not backend.isalpha() :
@@ -117 +122 @@
         raise PyKotaStorageError, _("Unsupported quota storage backend %s") % backend
     else :    
-        return getattr(storagebackend, "Storage")(host, database, (asadmin and admin) or user)
+        host = backendinfo["storageserver"]
+        database = backendinfo["storagename"]
+        admin = backendinfo["storageadmin"]
+        user = backendinfo["storageuser"]
+        adminpw = backendinfo["storageadminpw"]
+        userpw = backendinfo["storageuserpw"]
+        if asadmin :
+            return getattr(storagebackend, "Storage")(host, database, admin, adminpw)
+        else :    
+            return getattr(storagebackend, "Storage")(host, database, user, userpw)