Changeset 18336 for trunk/ippTools/src/pxinject.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/pxinject.c (modified) (4 diffs)

trunk/ippTools/src/pxinject.c

@@ -91 +91 @@
 
     if (!newExpInsert(config->dbh,
-                0x0,    // exp_id
+                0,    // exp_id
                 tmp_exp_name,
                 tmp_camera,
@@ -110 +110 @@
     }
 
-    psS64 lastInsertID = psDBLastInsertID(config->dbh);
-    psString exp_id = psDBIntToString(lastInsertID);
+    psS64 exp_id = psDBLastInsertID(config->dbh);
 
     psMetadata *md = psMetadataAlloc();
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_id", 0, NULL, exp_id)) {
+    if (!psMetadataAddS64(md, PS_LIST_TAIL, "exp_id", 0, NULL, exp_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
         psFree(md);
-        psFree(exp_id);
     }
-    psFree(exp_id);
 
     // negate simple so the default is true
@@ -137 +134 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    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(tmp_class_id, config->args, "-tmp_class_id", true, false);
     PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
 
     // insert with error flag state set to 0 (no errors)
-    if (!newImfileInsert(config->dbh, (psS64)atoll(exp_id), tmp_class_id, uri, NULL)) {
+    if (!newImfileInsert(config->dbh, exp_id, tmp_class_id, uri, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -155 +152 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    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(state, config->args, "-state", true, false);