Changeset 28484 for branches/pap/ippToPsps/src/ippToPsps.c

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippToPsps/src/ippToPsps.c (modified) (5 diffs)

branches/pap/ippToPsps/src/ippToPsps.c

@@ -93 +93 @@
     if (this->numOfInputFiles < 1) return false;
 
-
     this->inputFiles = (char**)calloc(this->numOfInputFiles, sizeof(char*));
     for(uint32_t i=0; i<this->numOfInputFiles; i++)
@@ -144 +143 @@
     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, "-survey", 0, "Survey type", 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->surveyType = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-survey"));
         this->fitsInPath = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-input"));
         this->resultsPath = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-results"));
@@ -176 +179 @@
 
         if (
+                (this->batchType != BATCH_INIT && !this->expName) || 
+                (this->batchType != BATCH_INIT && !this->surveyType) || 
                 (this->batchType != BATCH_INIT && !this->fitsInPath) || 
                 (this->batchType != BATCH_INIT && !this->resultsPath) || 
@@ -237 +242 @@
 
     this->expId = -1;
+    this->expName = NULL;
+    this->surveyType = NULL;
     this->fitsInPath = NULL;
     this->resultsPath = NULL;