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

Timestamp:

Mar 23, 2011, 4:27:17 PM (15 years ago)

Author:

rhenders

Message:

Introduced new logging system in order to provide proper audit trail

File:

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

trunk/ippToPsps/src/Batch.c

@@ -63 +63 @@
         if (this->exitCode != PS_EXIT_SUCCESS) {
 
-            psError(PS_ERR_UNKNOWN, false, "Failed, so deleting fits file");
+            this->logger->print(this->logger, MSG_ERROR, "Batch: Failed, so deleting fits file\n");
             this->fitsOut->delete(this->fitsOut);
         }
@@ -105 +105 @@
     if (file == NULL) {
 
-        psError(PS_ERR_UNKNOWN, false, "Unable to open file at %s", this->fitsInPath);
+        this->logger->print(this->logger, MSG_ERROR, "Batch: Unable to open file at %s\n", this->fitsInPath);
         return false;
     }
@@ -113 +113 @@
     while (fgets(line, 1000, file) != NULL) this->numOfInputFiles++;
 
-    printf ("Number of input files %d\n", this->numOfInputFiles);
+    this->logger->print(this->logger, MSG_INFO, "Batch: %d input files found\n", this->numOfInputFiles);
 
     if (this->numOfInputFiles < 1) return false;
@@ -156 +156 @@
     if (!this->pmconfig) {
 
-        psError(PS_ERR_UNKNOWN, false, "Unable to read configuration.");
+        this->logger->print(this->logger, MSG_ERROR, "Batch: Unable to read configuration\n");
         this->exitCode = PS_EXIT_CONFIG_ERROR;
         return false;
@@ -220 +220 @@
 
     // create an InitData object and get survey ID
-    this->initData = new_InitData(configsBaseDir);
+    this->initData = new_InitData(configsBaseDir, this->logger);
     if (strlen(this->surveyType) > 0 && 
             !this->initData->getSurveyId(this->initData, this->surveyType, &this->surveyID)) {
@@ -230 +230 @@
     // create a FitsGenerator object
     strcat(configsBaseDir, configsDir);
-    this->fitsGenerator = new_FitsGenerator(configsBaseDir);
+    this->fitsGenerator = new_FitsGenerator(this->logger, configsBaseDir);
 
     // create full FITS out path
@@ -236 +236 @@
 
     // create an output FITS file
-    this->fitsOut = new_Fits(fitsOutPath);
+    this->fitsOut = new_Fits(fitsOutPath, this->logger);
     if (this->fitsOut->getFilePtr(this->fitsOut) == NULL) return false;
 
@@ -306 +306 @@
   Constructor. Takes a Batch object and initialises it.
   */
-bool new_Batch(Batch *this) {
-
+bool new_Batch(Logger* logger, Batch *this) {
+
+    this->logger = logger;
     this->surveyID = -1;
     this->resultsXmlDoc = NULL;