Changeset 16507

Timestamp:

Feb 15, 2008, 9:50:53 AM (18 years ago)

Author:

eugene

Message:

clarified usage/help message; added current db information for safety

File:

• trunk/ippTools/src/pxadminConfig.c (modified) (4 diffs)

trunk/ippTools/src/pxadminConfig.c

@@ -26 +26 @@
 #include "pxtools.h"
 #include "pxadmin.h"
+
+static void pxAdminShowDB (pxConfig *config, const char *program) {
+
+    bool status;
+
+    fprintf (stderr, "\nPan-STARRS Phase 2 Admin Tool\n\n");
+    fprintf (stderr, "Usage: %s [mode]\n", program);
+    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");
+
+    fprintf (stderr, "connecting to %s as %s (port %d)\n", dbServer, dbUsername, dbPort);
+    fprintf (stderr, "using database %s\n\n", dbName);
+
+    return;
+}
 
 pxConfig *pxAdminConfig(pxConfig *config, int argc, char **argv)
@@ -78 +97 @@
 
     if (config->mode == PXADMIN_MODE_NONE) {
+        pxAdminShowDB (config, argv[0]);
         fprintf (stderr, "admin mode not specified\n");
+
         psArgumentHelp(arguments);
         psFree(arguments);
@@ -86 +107 @@
 
     if ((N = psArgumentGet (argc, argv, "-help"))) {
+        pxAdminShowDB (config, argv[0]);
         psArgumentHelp(arguments);
         psFree(arguments);
@@ -93 +115 @@
 
     if (! psArgumentParse(arguments, &argc, argv) || argc != 1) {
-        printf("\nPan-STARRS Phase 2 Admin Tool\n\n");
-        printf("Usage: %s [mode]\n", argv[0]);
-        printf(" [mode] : -create | -delete\n\n");
+        pxAdminShowDB (config, argv[0]);
         psArgumentHelp(arguments);
         psFree(arguments);