Changeset 35022

Timestamp:

Jan 22, 2013, 12:46:56 PM (13 years ago)

Author:

eugene

Message:

fix mysql target

File:

• branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c (modified) (6 diffs)

branches/eam_branches/ipp-20121219/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

@@ -1 +1 @@
 # include "dvopsps.h"
-# define DEBUG 1
+# define DEBUG 0
 # define SQL_INSERT 1
 // 1 = write data via sql insert values = (), 
@@ -63 +63 @@
   }
   insert_detections_mysql_commit (&buffer, mysql);
-  if (DEBUG) fprintf (stderr, "inserted %d rows\n", Ninsert);
+  if (VERBOSE) fprintf (stderr, "inserted %d rows\n", Ninsert);
   FreeIOBuffer (&buffer);
 
@@ -79 +79 @@
 
 # if (SQL_INSERT)
-  PrintIOBuffer (buffer, "INSERT INTO dvoDetection (imageID, ippDetectID, detectID, ippObjID, objID, flags, zp, zpErr, airMass, expTime, ra, dec_, raErr, decErr) VALUES \n");
+  PrintIOBuffer (buffer, "INSERT INTO dvoDetectionFull (imageID, ippDetectID, detectID, ippObjID, objID, flags, zp, zpErr, airMass, expTime, ra, dec_, raErr, decErr) VALUES \n");
 # endif
 
@@ -97 +97 @@
                                 measure->detID,   // ippDetectID
                                 measure->extID,   // detectID
-                                ((uint64_t)average->catID << 32) + (uint64_t)average->objID, // ippObjID
+                                ((uint64_t)average->catID * 1000000000) + (uint64_t)average->objID, // ippObjID
+// NOTE: this is better, but the above is the current ippToPsps value
+//                              ((uint64_t)average->catID << 32) + (uint64_t)average->objID, // ippObjID
                                 average->extID,   // objID
                                 measure->dbFlags,  // flags
@@ -108 +110 @@
                                 measure->dXccd * 0.01 * fabs(measure->pltscale), // estimate of raErr
                                 measure->dYccd * 0.01 * fabs(measure->pltscale) // estimate of decErr
+// XXX fileID??
 # if (SQL_INSERT)
                    ); 
@@ -147 +150 @@
     }
     char sql[256];
-    snprintf (sql, 256, "load data infile '/tmp/dvopsps.dat' into table dvoDetection;");
+    snprintf (sql, 256, "load data infile '/tmp/dvopsps.dat' into table dvoDetectionFull;");
     int status = mysql_query(mysql, sql); 
 # endif