Changeset 18927 for trunk/ippTools/src/pxadmin.c

Timestamp:

Aug 5, 2008, 3:13:35 PM (18 years ago)

Author:

Paul Price

Message:

Using new function to get database details from user/site configuration.

File:

• trunk/ippTools/src/pxadmin.c (modified) (2 diffs)

trunk/ippTools/src/pxadmin.c

@@ -122 +122 @@
 
     {
-        bool status;
         char line[128], answer[128];
 
-        // XXX use the values defined in config->dbh?
-        psString dbName = psMetadataLookupStr(&status, config->modules->complete, "DBNAME");
+        psMetadataItem *name = pmConfigUserSite(config->modules, "DBNAME", PS_DATA_STRING);
+        if (!name) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to determine database name.");
+            return false;
+        }
+        psString dbName = name->data.str;
 
         fprintf(stdout, "*** delete the tables from database %s? ***\n", dbName);
@@ -150 +153 @@
         sscanf(line, "%s", answer);
 
-        psString dbPassword = psMetadataLookupStr(&status, config->modules->complete, "DBPASSWORD");
+        psMetadataItem *pass = pmConfigUserSite(config->modules, "DBPASSWORD", PS_DATA_STRING);
+        if (!pass) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to determine database password.");
+            return false;
+        }
+        psString dbPassword = pass->data.str;
         if (strcmp (answer, dbPassword)) {
             psError(PS_ERR_UNKNOWN, true, "invalid passwd - tables NOT deleleted");