Changeset 31986 for trunk/ippToPsps/src/Dvo.c

Timestamp:

Aug 2, 2011, 4:33:08 PM (15 years ago)

Author:

rhenders

Message:

changes to support config path being passed to constructor

File:

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

trunk/ippToPsps/src/Dvo.c

@@ -117 +117 @@
   Constructor.
   */
-Dvo* new_Dvo(Logger* logger, const char* dvoDatabase) {
+Dvo* new_Dvo(Logger* logger, const char* configFile, const char* dvoDatabase) {
 
     Dvo* this = (Dvo*)calloc(1, sizeof(Dvo));
@@ -123 +123 @@
     this->logger->print(this->logger, MSG_DEBUG, "Dvo", "Constructor\n");
 
-    const char *configFile = "./config.xml"; // TODO hardcoded path to config
     this->logger->print(this->logger, MSG_INFO, "Dvo", "Using config file here '%s'\n", configFile);
     xmlDoc* doc = xmlReadFile(configFile, NULL, 0);
@@ -226 +225 @@
     Logger* logger = new_Logger(NULL, true);
 
-    if (argc < 2) {
+    if (argc < 3) {
 
         logger->print(logger, MSG_ERROR, "Dvo", "Incorrect arguments\n");
-        logger->print(logger, MSG_INFO, "Dvo", "Usage: ./dvo <pathToDvo>\n");
+        logger->print(logger, MSG_INFO, "Dvo", "Usage: ./dvo <pathToConfig> <pathToDvo>\n");
     }
     else {
         //Dvo * dvo = new_Dvo(logger, "/data/ipp004.0/gpc1/catdirs/ThreePi.V1");
-        Dvo * dvo = new_Dvo(logger, argv[1]);
+        Dvo * dvo = new_Dvo(logger, argv[1], argv[2]);
         //dvo->getDetections(dvo, 33, 8345290);
         dvo->getDetections(dvo);