Changeset 31011 for trunk/ippToPsps/src/InitBatch.c

Timestamp:

Mar 22, 2011, 4:11:23 PM (15 years ago)

Author:

rhenders

Message:

Using new Fits class and Config class

File:

• trunk/ippToPsps/src/InitBatch.c (modified) (3 diffs)

trunk/ippToPsps/src/InitBatch.c

@@ -18 +18 @@
     if (this->base.exitCode != PS_EXIT_SUCCESS) return this->base.exitCode;
 
-    if (!ippToPspsConfig_populateFromFile(this->base.config, this->base.fitsOut)) 
+    if (!this->base.config->populateFromFile(this->base.config, this->base.fitsOut)) 
         this->base.exitCode = PS_EXIT_CONFIG_ERROR;
     else this->base.exitCode = PS_EXIT_SUCCESS;
@@ -34 +34 @@
 
 /**
-  Reads command-line arguments.  Calls base-calls print method first.
+  Reads command-line arguments.
   */
 static bool parseArguments(InitBatch* this, int argc, char **argv) {
 
-    this->base.parseArguments(&this->base, argc, argv);
+    this->base.parseArguments(&this->base, argc, argv, "/init", "00000000.FITS");
 
     if (
@@ -68 +68 @@
     }
 
+    // method pointers
     this->print = print;
     this->destroy = destroy;
     this->base.run = run;
 
-    if (!parseArguments(this, *argc, argv)) { return this; }
-
-    strcat(this->base.configsDir, "/init");
-    sprintf(this->base.fitsOutFile, "00000000.FITS");
-
-    this->base.init(&this->base);
+    parseArguments(this, *argc, argv);
 
     return this;