Changeset 14046 for trunk/ippTools/src/dettool.c

Timestamp:

Jul 6, 2007, 3:27:59 PM (19 years ago)

Author:

jhoblitt

Message:

try to always handle det_id as a psS64

File:

• trunk/ippTools/src/dettool.c (modified) (24 diffs)

trunk/ippTools/src/dettool.c

@@ -80 +80 @@
 //static psArray *validDetInputClassIds(pxConfig *config, const char *det_id);
 //static psArray *searchInputImfiles(pxConfig *config, const char *det_id);
-static detInputExpRow *rawDetrenTodetInputExpRow(rawExpRow *rawExp, psS32 det_id, psS32 iteration);
+static detInputExpRow *rawDetrenTodetInputExpRow(rawExpRow *rawExp, psS64 det_id, psS32 iteration);
 static psArray *searchRawImfiles(pxConfig *config, psMetadata *where);
 static psS32 incrementIteration(pxConfig *config, const char *det_id);
@@ -569 +569 @@
     psFree(use_begin);
     psFree(use_end);
-    long det_id = psDBLastInsertID(config->dbh);
+    psS64 det_id = psDBLastInsertID(config->dbh);
 
     // create new detInputExp row(s) from the rawExp row(s)
@@ -617 +617 @@
     {
         psMetadata *where = psMetadataAlloc();
-        psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==", det_id);
+        psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", det_id);
         detRuns = psDBSelectRows(config->dbh, "detRun", where, 0);
         psFree(where);
@@ -627 +627 @@
     // sanity check results
     if (psArrayLength(detRuns) != 1) {
-        psAbort("found more then one detRun matching det_id %ld(this should not happen)", det_id);
+        psAbort("found more then one detRun matching det_id %" PRId64 " (this should not happen)", det_id);
         return false;
     }
@@ -1300 +1300 @@
     psFree(use_begin);
     psFree(use_end);
-    long det_id = psDBLastInsertID(config->dbh);
+    psS64 det_id = psDBLastInsertID(config->dbh);
 
     // create new detInputExp row(s) from the rawExp row(s)
@@ -1339 +1339 @@
     {
         psMetadata *where = psMetadataAlloc();
-        psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==", det_id);
+        psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", det_id);
         detRuns = psDBSelectRows(config->dbh, "detRun", where, 0);
         psFree(where);
@@ -1349 +1349 @@
     // sanity check results
     if (psArrayLength(detRuns) != 1) {
-        psAbort("found more then one detRun matching det_id %ld(this should not happen)", det_id);
+        psAbort("found more then one detRun matching det_id %" PRId64 " (this should not happen)", det_id);
         return false;
     }
@@ -1761 +1761 @@
 
     // get the det_id
-    long newDet_id = psDBLastInsertID(config->dbh);
+    psS64 newDet_id = psDBLastInsertID(config->dbh);
 
     psString query = psStringCopy(
@@ -1810 +1810 @@
     {
         psMetadata *where = psMetadataAlloc();
-        psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==", newDet_id);
+        psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", newDet_id);
         newDetRuns = psDBSelectRows(config->dbh, "detRun", where, 0);
         psFree(where);
@@ -1820 +1820 @@
     // sanity check the result... we should have only found one det_id
     if (psArrayLength(newDetRuns) != 1) {
-        psAbort("found more then one detRun matching det_id %ld(this should not happen)", newDet_id);
+        psAbort("found more then one detRun matching det_id %" PRId64 " (this should not happen)", newDet_id);
         return false;                   // unreachable
     }
@@ -1972 +1972 @@
 }
 
-static detInputExpRow *rawDetrenTodetInputExpRow(rawExpRow *rawExp, psS32 det_id, psS32 iteration)
+static detInputExpRow *rawDetrenTodetInputExpRow(rawExpRow *rawExp, psS64 det_id, psS32 iteration)
 {
     PS_ASSERT_PTR_NON_NULL(rawExp, NULL);
@@ -2372 +2372 @@
     // create a new detProcessedImfile object
     detProcessedImfileRow *detRow = detProcessedImfileRowAlloc(
-        (psS32)atol(det_id),
+        (psS64)atoll(det_id),
         (psS64)atoll(exp_id),
         class_id,
@@ -2649 +2649 @@
     // create a new detProcessedImfile object
     detProcessedExpRow *detRow = detProcessedExpRowAlloc(
-        (psS32)atol(det_id),
+        (psS64)atoll(det_id),
         (psS64)atoll(exp_id),
         recipe,
@@ -3066 +3066 @@
     // det_id
     psMetadata *where = psMetadataAlloc();
-    if (!psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==",
+    if (!psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==",
             (psS64)atoll(det_id))) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
@@ -3095 +3095 @@
     // create a new detStackedImfile object
     detStackedImfileRow *stackedImfile = detStackedImfileRowAlloc(
-            (psS32)atol(det_id),
+            (psS64)atoll(det_id),
             iteration,
             class_id,
@@ -4053 +4053 @@
     // create a new detProcessedImfile object
     detNormalizedExpRow *detRow = detNormalizedExpRowAlloc(
-        (psS32)atol(det_id),
+        (psS32)atoll(det_id),
         iteration,
         recipe,
@@ -5160 +5160 @@
     bool status = false;
     // values from row
-    psS32 det_id = psMetadataLookupS32(&status, row, "det_id");
+    psS64 det_id = psMetadataLookupS64(&status, row, "det_id");
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for det_id");
@@ -5802 +5802 @@
     bool status = false;
     // from row
-    psS32 det_id = psMetadataLookupS32(&status, row, "det_id");
+    psS64 det_id = psMetadataLookupS64(&status, row, "det_id");
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for det_id");
@@ -6108 +6108 @@
         if (!detInputExpInsert(
                     config->dbh,
-                    (psS32)atol(det_id),
+                    (psS64)atoll(det_id),
                     newIteration,
                     (psS64)atoll(exp_id),
@@ -6187 +6187 @@
         psFree(iter);
     } else {
-        psAbort(                "-exp_id was not parsed correctly (this should not happen");
+        psAbort("-exp_id was not parsed correctly (this should not happen");
     }
 
@@ -6194 +6194 @@
 
     // add the det_id & iteration == 0 to the where clause
-    if (!psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==",
-                (psS32)atol(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);
@@ -6267 +6267 @@
         }
         detInputExpRow *newInputExp = detInputExpRowAlloc(
-            (psS32)atol(det_id),
+            (psS64)atoll(det_id),
             newIteration,
             inputExp->exp_id,
@@ -6610 +6610 @@
     {
         psMetadata *where = psMetadataAlloc();
-        psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==", det_id);
+        psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", det_id);
         detRuns = psDBSelectRows(config->dbh, "detRun", where, 0);
         psFree(where);
@@ -6780 +6780 @@
     psMetadata *where = psMetadataAlloc();
     if (!psMetadataAddS32(where, PS_LIST_TAIL, "det_id", 0, "==",
-                (psS32)atol(det_id))) {
+                (psS32)atoll(det_id))) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item det_id");
         psFree(where);