Changeset 12131 for trunk/ippTools/src/difftool.c

Timestamp:

Feb 28, 2007, 6:44:37 PM (19 years ago)

Author:

jhoblitt

Message:

rename all *_version fields to be *_id
change chip* tables to use a chip_id
change cam* tables to use a cam_id
change all *_id fields to be S64

File:

• trunk/ippTools/src/difftool.c (modified) (6 diffs)

trunk/ippTools/src/difftool.c

@@ -281 +281 @@
     // constrants
     if (!diffInputSkyfileInsert(config->dbh,
-            (psS32)atoi(diff_id),
-            (psS32)atoi(warp_id),
+            (psS64)atoll(diff_id),
+            (psS64)atoll(warp_id),
             skycell_id,
             tess_id,
@@ -322 +322 @@
         " JOIN warpInputExp\n"
         "   ON diffInputSkyfile.warp_id    = warpInputExp.warp_id\n"
+        " JOIN camProcessedExp\n"
+        "   ON warpInputExp.cam_id = camProcessedExp.cam_id\n"
+        " JOIN chipProcessedExp\n"
+        "   ON camProcessedExp.chip_id = chipProcessedExp.chip_id\n"
         " JOIN rawExp\n"
-        "   ON warpInputExp.exp_tag        = rawExp.exp_tag\n"
+        "   ON chipProcessedExp.exp_tag = rawExp.exp_tag\n"
         " WHERE\n"
         "   diffRun.state = 'run'\n"
@@ -379 +383 @@
 
     if (psArrayLength(output)) {
+        if (!convertIdToStr(output)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
+            psFree(output);
+            return false;
+        }
+
         // negative simple so the default is true
         if (!ippdbPrintMetadatas(stdout, output, "diffInputSkyfile", !simple)) {
@@ -474 +484 @@
 
     if (psArrayLength(output)) {
+        if (!convertIdToStr(output)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
+            psFree(output);
+            return false;
+        }
+
         // negative simple so the default is true
         if (!ippdbPrintMetadatas(stdout, output, "diffSkyfile", !simple)) {
@@ -532 +548 @@
 
     if (!diffSkyfileInsert(config->dbh,
-            (psS32)atoi(diff_id),
+            (psS64)atoll(diff_id),
             uri,
             bg,
@@ -637 +653 @@
 
     if (psArrayLength(output)) {
+        if (!convertIdToStr(output)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
+            psFree(output);
+            return false;
+        }
+
         // negative simple so the default is true
         if (!ippdbPrintMetadatas(stdout, output, "diffSkyfile", !simple)) {