Changeset 33710

Timestamp:

Apr 4, 2012, 4:24:10 PM (14 years ago)

Author:

rhenders

Message:

added method to get current config for this client; altered method to get list of configs to include only 'active' configs; added method to set the config for a given client

File:

• trunk/ippToPsps/jython/ipptopspsdb.py (modified) (4 diffs)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -746 +746 @@
 
     '''
+    Sets the config field for this client
+    '''
+    def setConfigForThisClient(self, config, host, pid):
+
+        self.execute("UPDATE clients SET config = '" + config + "' \
+                WHERE host = '" + host + "' \
+                AND pid = " + str(pid))
+    '''
     Sets the config field for a set of loader clients
     '''
@@ -831 +839 @@
     Returns a list of available configs
     '''
-    def getConfigList(self):
+    def getActiveConfigList(self):
         
-        sql = "SELECT DISTINCT name FROM config"
+        sql = "SELECT DISTINCT name FROM config WHERE active = 1 ORDER BY name"
 
         configs = []
@@ -880 +888 @@
 
     '''
-    Reads config from the database and populates Config object
-    '''
-    def readConfig(self, host, pid):
-
-        # first get config defined for this client
+    Returns config for this client
+    '''
+    def getConfigForThisClient(self, host, pid):
+
         sql = "SELECT config \
                FROM clients \
@@ -898 +905 @@
             self.config.isLoaded = False
             return False
+
+        return True
+
+    '''
+    Reads config from the database and populates Config object
+    '''
+    def readConfig(self, host, pid):
+
+        # first get config defined for this client
+        if not self.getConfigForThisClient(host, pid): return False
 
         # now load that config