Changeset 18247 for trunk/pstamp/src

Timestamp:

Jun 20, 2008, 3:08:02 PM (18 years ago)

Author:

bills

Message:

more tweaks.

Location:

trunk/pstamp/src

Files:

• pstampfinish.c (modified) (3 diffs)
• pstampparse.c (modified) (2 diffs)

trunk/pstamp/src/pstampfinish.c

@@ -26 +26 @@
     psString    dsRoot;
     psString    dsProduct;
+    psString    dbName;
     int         exitStatus;
 } psrfOptions;
@@ -70 +71 @@
         return NULL;
     }
+    psBool status;
+    options->dbName = psMetadataLookupStr(&status, options->config->complete, "DBNAME");
 
     if ((argnum = psArgumentGet(argc, argv, "-mode"))) {
@@ -265 +268 @@
     psString command = NULL;
 
-    psStringAppend(&command, "dsreg --add --type PSRESULTS --product %s --fileset %s", 
-            options->dsProduct, fileset_id);
-
-    printf("command is: %s\n", command);
+    psStringAppend(&command, "dsreg --dbname %s --add --type PSRESULTS --product %s --fileset %s", 
+            options->dbName, options->dsProduct, fileset_id);
+
+    if (options->verbose) {
+        fprintf(stderr, "command is: %s\n", command);
+    }
 
     // open a pipe to dsreg and set up the output fileset

trunk/pstamp/src/pstampparse.c

@@ -64 +64 @@
     }
 
+    // XXX: need to sort out the interactions of this mode option and the JOB_TYPE
+    // listed in the request file.
     if ((argnum = psArgumentGet(argc, argv, "-mode"))) {
         psArgumentRemove(argnum, &argc, argv);
@@ -629 +631 @@
         psStringAppend(&cmd, " -args '%s'", commandArgs);
     }
+    // XXX We may want to have the data store name be different than the default DB
+    psBool status;
+    psString dbName = psMetadataLookupStr(&status, options->config->complete, "DBNAME");
+    fprintf(stderr, "\n\n   dbName is %s\n", dbName);
+    if (dbName) {
+        psStringAppend(&cmd, " -dbname %s", dbName);
+    }
+
     psStringAppend(&cmd, " > /dev/null");