Changeset 12131 for trunk/ippTools/src/dettool.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/dettool.c (modified) (16 diffs)

trunk/ippTools/src/dettool.c

@@ -25 +25 @@
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
+
 #include <ippdb.h>
 
@@ -70 +72 @@
 static bool register_detrend_imfileMode(pxConfig *config);
 
-static bool convertDetIdToStr(psArray *mds);
 static detNormalizedStatImfileRow *detStackedToDetNormalizedStatImfile(pxConfig *config, detStackedImfileRow *stackedImfile);
 static  detNormalizedImfileRow *detNormalizedStatToDetNormalizedmfile(pxConfig *config, detNormalizedStatImfileRow *statImfile);
@@ -598 +599 @@
     }
 
-    // convert det_id to a str externally
-    if (!convertDetIdToStr(detRuns)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to convert det_id to a string");
+    if (!convertIdToStr(detRuns)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
         psFree(detRuns);
         return false;
@@ -616 +616 @@
 }
 
+#if 0
 // This function is used to convert the det_id from an int, as it is used
 // internally, to be a string for external use.  The rational being that we may
@@ -640 +641 @@
     return true;
 }
+#endif
 
 static bool definebyqueryMode(pxConfig *config)
@@ -1243 +1245 @@
 
     // convert det_id to a string externaly
-    if (!convertDetIdToStr(detRuns)) {
+    if (!convertIdToStr(detRuns)) {
         psError(PS_ERR_UNKNOWN, false, "failed to convert det_id to a string");
         psFree(detRuns);
@@ -1281 +1283 @@
     {
         psMetadata *where = psMetadataAlloc();
-        psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==", (psS32)atoi(det_id));
+        psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", (psS64)atoll(det_id));
         detRuns = detRunSelectRowObjects(config->dbh, where, 0);
         psFree(where);
@@ -1291 +1293 @@
     // sanity check the result... we should have only found one det_id
     if (psArrayLength(detRuns) != 1) {
-        psAbort("found more then one detRun matching det_id %d(this should not happen)", (psS32)atoi(det_id));
+        psAbort("found more then one detRun matching det_id %" PRId64 " (this should not happen)", (psS64)atoll(det_id));
         return false;                   // unreachable
     }
@@ -1624 +1626 @@
     psFree(time_filter);
 
-    if (!p_psDBRunQuery(config->dbh, query, (psS32)newDet_id, (psS32)atoi(det_id))) {
+    if (!p_psDBRunQuery(config->dbh, query, (psS64)newDet_id, (psS64)atoll(det_id))) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
@@ -1666 +1668 @@
 
     // convert det_id to a string externaly
-    if (!convertDetIdToStr(newDetRuns)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to convert det_id to a string");
-        psFree(newDetRuns);
+    if (!convertIdToStr(detRuns)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
+        psFree(detRuns);
         return false;
     }
@@ -1701 +1703 @@
 
     // convert det_id to a string externaly
-    if (!convertDetIdToStr(runs)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to convert det_id to a string");
+    if (!convertIdToStr(runs)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
         psFree(runs);
         return false;
@@ -1784 +1786 @@
 
     // convert det_id to a string externaly
-    if (!convertDetIdToStr(output)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to convert det_id to a string");
+    if (!convertIdToStr(output)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
         psFree(output);
         return false;
@@ -2907 +2909 @@
     psMetadata *where = psMetadataAlloc();
     if (!psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==",
-            (psS32)atoi(det_id))) {
+            (psS64)atoll(det_id))) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag");
         psFree(where);
@@ -4870 +4872 @@
             return false;
         }
-        if (!psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==", (psS32)atoi(det_id))) {
+        if (!psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", (psS64)atoll(det_id))) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item det_id");
             psFree(where);
@@ -6332 +6334 @@
             0.0,        // solang max
             label,      // label
-            atoi(parent)
+            (psS64)atoll(parent)
     )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -6435 +6437 @@
     // the det_id is valid
     if (!detNormalizedImfileInsert(config->dbh,
-            (psS32)atoi(det_id),
+            (psS64)atoll(det_id),
             0,  // the iteration is fixed at 0
             class_id,