Changeset 16611 for trunk/ippTools/src

Timestamp:

Feb 22, 2008, 10:21:52 AM (18 years ago)

Author:

eugene

Message:

using new user/site/system construction for config files

Location:

trunk/ippTools/src

Files:

• pxadminConfig.c (modified) (1 diff)
• pxtables.c (modified) (2 diffs)

trunk/ippTools/src/pxadminConfig.c

@@ -35 +35 @@
     fprintf (stderr, " [mode] : -create | -delete\n\n");
 
-    psString dbServer = psMetadataLookupStr(&status, config->modules->site, "DBSERVER");
-    psString dbUsername = psMetadataLookupStr(&status, config->modules->site, "DBUSER");
-    psString dbName = psMetadataLookupStr(&status, config->modules->site, "DBNAME");
-    psS32 dbPort = psMetadataLookupS32(&status, config->modules->site, "DBPORT");
+    // XXX EAM : this should be done with psDB function calls
+    psString dbServer = psMetadataLookupStr(&status, config->modules->complete, "DBSERVER");
+    psString dbUsername = psMetadataLookupStr(&status, config->modules->complete, "DBUSER");
+    psString dbName = psMetadataLookupStr(&status, config->modules->complete, "DBNAME");
+    psS32 dbPort = psMetadataLookupS32(&status, config->modules->complete, "DBPORT");
 
     fprintf (stderr, "connecting to %s as %s (port %d)\n", dbServer, dbUsername, dbPort);

trunk/ippTools/src/pxtables.c

@@ -116 +116 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    psString dbName = psMetadataLookupStr(&status, config->modules->site, "DBNAME");
+    // XXX use the values defined in config->dbh?
+    psString dbName = psMetadataLookupStr(&status, config->modules->complete, "DBNAME");
 
     fprintf (stdout, "*** delete the chip tables from database %s? ***\n", dbName);
@@ -136 +137 @@
     {
         bool status;
-        psString dbPassword = psMetadataLookupStr(&status, config->modules->site, "DBPASSWORD");
+        psString dbPassword = psMetadataLookupStr(&status, config->modules->complete, "DBPASSWORD");
         if (strcmp (answer, dbPassword)) {
             psError(PS_ERR_UNKNOWN, true, "tables NOT deleleted");