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

Timestamp:

Sep 21, 2010, 2:38:47 PM (16 years ago)

Author:

rhenders

Message:

Remove dependance on DVO Db

File:

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

trunk/ippToPsps/src/ippToPsps.c

@@ -250 +250 @@
     psMemSetDeallocator(this, (psFreeFunc)ippToPsps_Destructor);
 
+    // deal with DVO database
+    bool haveDvo = false;
+    for (int i=0;i<*argc; i++) {
+
+        if (strcmp(argv[i], "CATDIR") == 0) {haveDvo = true; break;}
+    }
+    if (haveDvo) this->dvoConfig = dvoConfigRead(argc, argv);
+    else this->dvoConfig = NULL;
+
+    // remaining args
     this->expId = -1;
     this->expName = NULL;
@@ -261 +271 @@
     this->fitsOut = NULL;
     this->configsDir = NULL;
-    this->dvoConfig = NULL;
     this->config = NULL;
-    this->dvoConfig = dvoConfigRead(argc, argv);
     this->pmconfig = pmConfigRead(argc, argv, NULL);
     this->exitCode = PS_EXIT_SUCCESS;
@@ -299 +307 @@
         psStringAppend(&this->configsDir, "/stack");
 
-
+    // create filename
     char outputName[100];
     sprintf(outputName, "%08d.FITS", this->expId);