Changeset 33345 for trunk/ippToPsps

Timestamp:

Feb 23, 2012, 4:10:02 PM (14 years ago)

Author:

rhenders

Message:

now explicitely taking scratch Db name as argument

Location:

trunk/ippToPsps/src

Files:

• Dvo.c (modified) (4 diffs)
• Dvo.h (modified) (1 diff)

trunk/ippToPsps/src/Dvo.c

@@ -116 +116 @@
   Constructor.
   */
-Dvo* new_Dvo(Logger* logger, const char* configFile, const char* dvoDatabase) {
+Dvo* new_Dvo(Logger* logger, const char* configFile, const char* dbname, const char* dvoDatabase) {
 
     Dvo* this = (Dvo*)calloc(1, sizeof(Dvo));
@@ -129 +129 @@
     char user[20];
     char passwd[20];
-    char dbname[20];
 
 
@@ -156 +155 @@
                     sprintf(name, "%s", dbParams->name);
                     value = xmlNodeListGetString(doc, dbParams->xmlChildrenNode, 1);
-                    if (strcmp(name, "name") == 0) sprintf(dbname, "%s", value);
-                    else if (strcmp(name, "user") == 0) sprintf(user, "%s", value);
+                    if (strcmp(name, "user") == 0) sprintf(user, "%s", value);
                     else if (strcmp(name, "host") == 0) sprintf(host, "%s", value);
                     else if (strcmp(name, "password") == 0) sprintf(passwd, "%s", value);
@@ -224 +222 @@
     Logger* logger = new_Logger(NULL, true);
 
-    if (argc < 3) {
+    if (argc < 4) {
 
         logger->print(logger, MSG_ERROR, "Dvo", "Incorrect arguments\n");
-        logger->print(logger, MSG_INFO, "Dvo", "Usage: ./dvo <pathToConfig> <pathToDvo>\n");
+        logger->print(logger, MSG_INFO, "Dvo", "Usage: ./dvo <pathToConfig> <dbName> <pathToDvo>\n");
     }
     else {
-        //Dvo * dvo = new_Dvo(logger, "/data/ipp004.0/gpc1/catdirs/ThreePi.V1");
-        Dvo * dvo = new_Dvo(logger, argv[1], argv[2]);
-        //dvo->getDetections(dvo, 33, 8345290);
+
+        Dvo * dvo = new_Dvo(logger, argv[1], argv[2], argv[3]);
         dvo->getDetections(dvo);
         dvo->destroy(dvo);

trunk/ippToPsps/src/Dvo.h

@@ -42 +42 @@
 
 // constructor
-Dvo* new_Dvo(Logger* logger, const char* configFile, const char* dvoDatabase);
+Dvo* new_Dvo(Logger* logger, const char* configFile, const char* dbname, const char* dvoDatabase);
 
 #endif // IPPTOPSPS_DVO_H