Changeset 18336 for trunk/ippTools/src/regtool.c

Timestamp:

Jun 26, 2008, 3:39:54 PM (18 years ago)

Author:

jhoblitt

Message:

consitently handle *_id fields as numeric values instead of converting back of forth between ints and strings

File:

• trunk/ippTools/src/regtool.c (modified) (8 diffs)

trunk/ippTools/src/regtool.c

@@ -170 +170 @@
 
     // required
-    PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
+    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false);
     PXOPT_LOOKUP_STR(exp_name, config->args, "-exp_name", true, false);
     PXOPT_LOOKUP_STR(camera, config->args, "-inst", true, false);
@@ -230 +230 @@
     if (!rawImfileInsert(
         config->dbh,
-        (psS64)atoll(exp_id),
+        exp_id,
         exp_name,
         camera,
@@ -496 +496 @@
 
     // required
-    PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
+    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false);
     PXOPT_LOOKUP_STR(exp_name, config->args, "-exp_name", true, false);
     PXOPT_LOOKUP_STR(camera, config->args, "-inst", true, false);
@@ -569 +569 @@
         // build a query to search by exp_id
         psMetadata *where = psMetadataAlloc();
-        if (!psMetadataAddStr(where, PS_LIST_TAIL, "newExp.exp_id", 0, "==", exp_id)) {
+        if (!psMetadataAddS64(where, PS_LIST_TAIL, "newExp.exp_id", 0, "==", exp_id)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
             psFree(where);
@@ -652 +652 @@
 
     if (!rawExpInsert(config->dbh,
-        (psS64)atoll(exp_id),
+        exp_id,
         exp_name,
         camera,
@@ -726 +726 @@
             psError(PS_ERR_UNKNOWN, false, "database error");
         }
-        psError(PS_ERR_UNKNOWN, false, "failed to change newExp.state for exp_id: %s", exp_id);
+        psError(PS_ERR_UNKNOWN, false, "failed to change newExp.state for exp_id: %"PRId64, exp_id);
     psFree(newExp);
         return false;
@@ -749 +749 @@
     // this can only be run as the newExp's state has been set to stop
     if (!pxchipQueueByExpTag(config,
-                (psS64)atoll(exp_id),
+                exp_id,
                 workdir,
             label,
@@ -797 +797 @@
 
     // XX test this out; need to make this consistent with the list in regtoolConfig.c
-    PXOPT_COPY_STR(config->args, config->where,  "-exp_id", "exp_id", "==");
+    PXOPT_COPY_S64(config->args, config->where,  "-exp_id", "exp_id", "==");
     PXOPT_COPY_STR(config->args, config->where,  "-exp_name", "exp_name", "==");
     PXOPT_COPY_STR(config->args, config->where,  "-inst", "camera", "==");