Changeset 31015 for trunk/ippToPsps/src/Batch.c

Timestamp:

Mar 23, 2011, 9:33:05 AM (15 years ago)

Author:

rhenders

Message:

New class to encapsulate initialization data

File:

• trunk/ippToPsps/src/Batch.c (modified) (6 diffs)

trunk/ippToPsps/src/Batch.c

@@ -87 +87 @@
     if (this->dvoConfig != NULL) dvoConfigFree(this->dvoConfig);
 
+    // destroy objects
     this->config->destroy(this->config);
+    this->initData->destroy(this->initData);
 
     pmConfigDone();
@@ -210 +212 @@
     }
 
-
-
+    // check we have some input paths
     if (haveFitsInPath && !readInputFilePaths(this)) {
 
@@ -218 +219 @@
     }
 
-    // create a config object
+    // create an InitData object and get survey ID
+    this->initData = new_InitData(configsBaseDir);
+    if (strlen(this->surveyType) > 0 && 
+            !this->initData->getSurveyId(this->initData, this->surveyType, &this->surveyID)) {
+
+        this->exitCode = PS_EXIT_CONFIG_ERROR;
+        return false;
+    }
+
+    // create a Config object
     strcat(configsBaseDir, configsDir);
     this->config = new_Config(configsBaseDir);
@@ -227 +237 @@
     }
 
-    // get survey ID using config object
-    if (strlen(this->surveyType) > 0 && !this->config->getSurveyId(this->config, this->surveyType, &this->surveyID)) {
-
-        this->exitCode = PS_EXIT_CONFIG_ERROR;
-        return false;
-    }
     // create full FITS out path
-    sprintf (fitsOutPath, "%s/%s", fitsOutPath, fitsOutFile);
+    sprintf(fitsOutPath, "%s/%s", fitsOutPath, fitsOutFile);
 
     // create an output FITS file
@@ -321 +325 @@
     // set up function pointers
     this->parseArguments = parseArguments;
-    //this->init = init;
     this->print = print;
-    this->destroy = destroy;
-
     this->gotResultsPath = gotResultsPath;
     this->gotFitsInPath = gotFitsInPath;
@@ -330 +331 @@
     this->gotConfig = gotConfig;
     this->gotSurveyType = gotSurveyType;
+    this->destroy = destroy;
 
     assert(this);