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

trunk/ippTools/src/stacktool.c

@@ -41 +41 @@
 static bool revertsumskyfileMode(pxConfig *config);
 
-static bool setstackRunState(pxConfig *config, const char *stack_id, const char *state);
+static bool setstackRunState(pxConfig *config, psS64 stack_id, const char *state);
 
 # define MODECASE(caseName, func) \
@@ -486 +486 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_STR(stack_id, config->args, "-stack_id", true, false);
+    PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
     PXOPT_LOOKUP_STR(state, config->args, "-state", true, false);
 
@@ -502 +502 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_STR(stack_id, config->args, "-stack_id", true, false);
-    PXOPT_LOOKUP_STR(warp_id, config->args, "-warp_id", true, false);
+    PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
+    PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);
 
     // XXX need to validate the warp_id here
@@ -509 +509 @@
     // constrants
     if (!stackInputSkyfileInsert(config->dbh,
-            (psS64)atoll(stack_id),
-            (psS64)atoll(warp_id)
+            stack_id,
+            warp_id
         )) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -574 +574 @@
 
     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, "stackInputSkyfile", !simple)) {
@@ -648 +642 @@
 
     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, "stackSumSkyfile", !simple)) {
@@ -673 +661 @@
 
     // required
-    PXOPT_LOOKUP_STR(stack_id, config->args, "-stack_id", true, false);
+    PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
 
     // optional
@@ -696 +684 @@
     // constrants
     if (!stackSumSkyfileInsert(config->dbh,
-                               (psS64)atoll(stack_id),
+                               stack_id,
                                uri,
                                path_base,
@@ -785 +773 @@
 
     if (psArrayLength(output)) {
-        if (!convertIdToStr(output)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
-            psFree(output);
-            return false;
-        }
-
         if (!ippdbPrintMetadatas(stdout, output, "stackSumSkyfile", !simple)) {
             psError(PS_ERR_UNKNOWN, false, "failed to print array");
@@ -836 +818 @@
 
 
-static bool setstackRunState(pxConfig *config, const char *stack_id, const char *state)
-{
-    PS_ASSERT_PTR_NON_NULL(stack_id, false);
+static bool setstackRunState(pxConfig *config, psS64 stack_id, const char *state)
+{
     PS_ASSERT_PTR_NON_NULL(state, false);
 
@@ -853 +834 @@
     }
 
-    char *query = "UPDATE stackRun SET state = '%s' WHERE stack_id = '%s'";
+    char *query = "UPDATE stackRun SET state = '%s' WHERE stack_id = %"PRId64;
     if (!p_psDBRunQuery(config->dbh, query, state, stack_id)) {
         psError(PS_ERR_UNKNOWN, false,
-                "failed to change state for stack_id %s", stack_id);
-        return false;
-    }
-
-    return true;
-}
+                "failed to change state for stack_id %"PRId64, stack_id);
+        return false;
+    }
+
+    return true;
+}