Changeset 28205 for trunk/ippToPsps/src/ippToPsps.c

Timestamp:

Jun 3, 2010, 3:33:37 PM (16 years ago)

Author:

rhenders

Message:

Now pulling exposure name from the Db and passing it to ippToPsps to include in FITS files

File:

• trunk/ippToPsps/src/ippToPsps.c (modified) (4 diffs)

trunk/ippToPsps/src/ippToPsps.c

@@ -144 +144 @@
     psMetadata *arguments = psMetadataAlloc();
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-expid", 0, "Exposure ID", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-expname", 0, "Exposure name", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-input", 0, "Path to FITS inout", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-output", 0, "Path to FITS output", NULL);
@@ -161 +162 @@
         if (tmp) this->expId = atoi(tmp);
         //free(tmp); tmp = NULL;
+        this->expName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-expname"));
         this->fitsInPath = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-input"));
         this->resultsPath = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-results"));
@@ -176 +178 @@
 
         if (
+                (this->batchType != BATCH_INIT && !this->expName) || 
                 (this->batchType != BATCH_INIT && !this->fitsInPath) || 
                 (this->batchType != BATCH_INIT && !this->resultsPath) || 
@@ -237 +240 @@
 
     this->expId = -1;
+    this->expName = NULL;
     this->fitsInPath = NULL;
     this->resultsPath = NULL;