Changeset 16878

Timestamp:

Mar 7, 2008, 3:45:20 PM (18 years ago)

Author:

bills

Message:

adapt to the completed data store interfaces

Location:

trunk/pstamp

Files:

• scripts/pstamp_new_request.sh (modified) (1 diff)
• src/pstampfinish.c (modified) (3 diffs)

trunk/pstamp/scripts/pstamp_new_request.sh

@@ -46 +46 @@
 
 # Invoke the data store registration script
-echo $request_file chip n/a | dsreg -dsdir $DATA_STORE -add -type PSTAMP $PRODUCT $fileset_id
+echo $request_file\|chip | dsreg --add --type PSREQUEST --product $PRODUCT --fileset $fileset_id
 
 status=$?

trunk/pstamp/src/pstampfinish.c

@@ -238 +238 @@
     psString command = NULL;
 
-    psStringAppend(&command, "dsreg -dsdir %s -add -type PSTAMP %s %s", 
-            options->dsRoot, options->dsProduct, fileset_id);
+    psStringAppend(&command, "dsreg --add --type PSRESPONSE --product %s --fileset %s", 
+            options->dsProduct, fileset_id);
 
     printf("command is: %s\n", command);
@@ -245 +245 @@
     // open a pipe to dsreg and set up the output fileset
     // Each line of input describes one of the files
-    #define DSREG_FORMAT_STRING "%s chip na\n"
+    #define DSREG_FORMAT_STRING "%s|%s\n"
 
     FILE *pipe = popen(command, "w");
@@ -255 +255 @@
 
     // First the results table that we built above
-    fprintf(pipe, DSREG_FORMAT_STRING, "results.fits");
+    fprintf(pipe, DSREG_FORMAT_STRING, "results.fits", "psresults");
 
     // Next each of the stamps
     for (int i = 0; i < numStamps; i++) {
-        fprintf(pipe, DSREG_FORMAT_STRING, (psString) psArrayGet(stamps, i));
+        fprintf(pipe, DSREG_FORMAT_STRING, (psString) psArrayGet(stamps, i), "pstamp");
     }