Changeset 33638 for branches/eam_branches/ipp-20111122/ippToPsps/src/Dvo.c

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ippToPsps/src/Dvo.c (modified) (9 diffs)

branches/eam_branches/ipp-20111122/ippToPsps/src/Dvo.c

@@ -35 +35 @@
     mysql_query(this->mysql, "DELETE FROM dvoDetection");
 
-    mysql_query(this->mysql, "SELECT sourceID, externID FROM dvoMeta");
+    mysql_query(this->mysql, "SELECT SOURCE_ID, EXTERN_ID FROM dvoImages");
     MYSQL_RES* result = mysql_store_result(this->mysql);
 
@@ -47 +47 @@
         externID = atoi(row[1]);
 
-        this->logger->print(this->logger, MSG_INFO, "Dvo", "---------------------------------------------------------------------\n");
-        this->logger->print(this->logger, MSG_INFO, "Dvo", "Getting skylist from DVO database for source ID = %d and extern ID = %d\n",
-                sourceID, externID); 
+        //this->logger->print(this->logger, MSG_INFO, "Dvo", "---------------------------------------------------------------------\n");
+        //this->logger->print(this->logger, MSG_INFO, "Dvo", "Getting skylist from DVO database for source ID = %d and extern ID = %d\n",
+        //        sourceID, externID); 
         skyList = dvoSkyListByExternID(this->dvoConfig, sourceID, externID, &image);
         if (!skyList) {
@@ -61 +61 @@
 
         sprintf(sql, 
-                "UPDATE dvoMeta SET imageID = %d,flags = %d, photcode = %d WHERE sourceID = %d AND externID = %d",
+                "UPDATE dvoImages SET IMAGE_ID = %d, FLAGS = %d, PHOTCODE = %d WHERE SOURCE_ID = %d AND EXTERN_ID = %d",
                 image->imageID,
                 image->flags,
@@ -70 +70 @@
 
         // now get detections
-        this->logger->print(this->logger, MSG_INFO, "Dvo", "Getting detections...\n"); 
+        //this->logger->print(this->logger, MSG_INFO, "Dvo", "Getting detections...\n"); 
         dvoDetection* dvoDetections = NULL;
         int32_t maxDetectionId = -1;
-        int32_t numDetections = 
+        //int32_t numDetections = 
             dvoGetDetections(skyList, image->imageID, &dvoDetections, &maxDetectionId);
 
-        this->logger->print(this->logger, MSG_INFO, "Dvo", 
-                "Found %d detections with a max detection ID of %d\n", 
-                numDetections, maxDetectionId); 
-
-
-        this->logger->print(this->logger, MSG_INFO, "Dvo", "Inserting IDs into dvoDetection table...\n"); 
+        //this->logger->print(this->logger, MSG_INFO, "Dvo", 
+        //        "Found %d detections with a max detection ID of %d\n", 
+        //        numDetections, maxDetectionId); 
+
+
+        //this->logger->print(this->logger, MSG_INFO, "Dvo", "Inserting IDs into dvoDetection table...\n"); 
 
         uint32_t zeroDvoCount = 0;
@@ -91 +91 @@
             else {
                 sprintf(sql, 
-                        "INSERT INTO dvoDetection (sourceID, imageID, ippDetectID, detectID, ippObjID, objID, flags) VALUES (%d, %d, %u, %lu, %lu, %lu, %u)",
-                        sourceID,   // sourceID
+                        "INSERT INTO dvoDetection (imageID, ippDetectID, detectID, ippObjID, objID, flags) VALUES (%d, %u, %lu, %lu, %lu, %u)",
                         image->imageID,    // imageID
                         dvoDetections[i].meas.detID,   // ippDetectID
@@ -117 +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));
@@ -130 +129 @@
     char user[20];
     char passwd[20];
-    char dbname[20];
 
 
@@ -157 +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);
@@ -225 +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);