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

Timestamp:

Aug 1, 2011, 4:05:53 PM (15 years ago)

Author:

rhenders

Message:

finally cleared up image_id/extern_id confusion

File:

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

trunk/ippToPsps/src/Dvo.c

@@ -35 +35 @@
     mysql_query(this->mysql, "DELETE FROM dvoDetection");
 
-    mysql_query(this->mysql, "SELECT sourceID, imageID FROM dvoMeta");
+    mysql_query(this->mysql, "SELECT sourceID, externID FROM dvoMeta");
     MYSQL_RES* result = mysql_store_result(this->mysql);
 
@@ -41 +41 @@
     MYSQL_ROW row;
     char sql[500];
-    int sourceID, imageID;
+    int sourceID, externID;
     while ((row = mysql_fetch_row(result))) {
 
         sourceID = atoi(row[0]);
-        imageID = atoi(row[1]);
+        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 image ID = %d\n",
-                sourceID, imageID); 
-        skyList = dvoSkyListByExternID(this->dvoConfig, sourceID, imageID, &image);
+        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) {
 
             this->logger->print(this->logger, MSG_ERROR, 
-                    "Dvo", "Could not find skylist for sourceId=%d and image ID = %d\n", 
-                    sourceID, imageID);
+                    "Dvo", "Could not find skylist for sourceId=%d and extern ID = %d\n", 
+                    sourceID, externID);
 
             continue;
@@ -61 +61 @@
 
         sprintf(sql, 
-                "UPDATE dvoMeta SET flags = %d, photcode = %d WHERE sourceID = %d AND imageID = %d",
+                "UPDATE dvoMeta SET imageID = %d,flags = %d, photcode = %d WHERE sourceID = %d AND externID = %d",
+                image->imageID,
                 image->flags,
                 image->photcode,
                 sourceID,
-                imageID);
+                externID);
         mysql_query(this->mysql, sql); 
 
@@ -92 +93 @@
                         "INSERT INTO dvoDetection (sourceID, imageID, ippDetectID, detectID, ippObjID, objID, flags) VALUES (%d, %d, %u, %lu, %lu, %lu, %u)",
                         sourceID,   // sourceID
-                        imageID,    // imageID
+                        image->imageID,    // imageID
                         dvoDetections[i].meas.detID,   // ippDetectID
                         dvoDetections[i].meas.extID,   // detectID