Changeset 18357 for branches/cleanup/ippTools/src/difftool.c

Timestamp:

Jun 29, 2008, 2:44:04 PM (18 years ago)

Author:

eugene

Message:

merge cvs HEAD into cleanup branch

File:

• branches/cleanup/ippTools/src/difftool.c (modified) (18 diffs)

branches/cleanup/ippTools/src/difftool.c

@@ -42 +42 @@
 static bool definebyqueryMode(pxConfig *config);
 
-static bool setdiffRunState(pxConfig *config, const char *diff_id, const char *state);
+static bool setdiffRunState(pxConfig *config, psS64 diff_id, const char *state);
 
 # define MODECASE(caseName, func) \
@@ -146 +146 @@
 
     // required options
-    PXOPT_LOOKUP_STR(diff_id, config->args, "-diff_id", true, false);
+    PXOPT_LOOKUP_S64(diff_id, config->args, "-diff_id", true, false);
     PXOPT_LOOKUP_STR(state, config->args, "-state", true, false);
 
@@ -163 +163 @@
 
     // required options
-    PXOPT_LOOKUP_STR(diff_id, config->args, "-diff_id", true, false);
+    PXOPT_LOOKUP_S64(diff_id, config->args, "-diff_id", true, false);
 
     // optional
-    PXOPT_LOOKUP_STR(stack_id, config->args, "-stack_id", false, false);
-    PXOPT_LOOKUP_STR(warp_id, config->args, "-warp_id", false, false);
+    PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", false, false);
+    PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", false, false);
     PXOPT_LOOKUP_STR(kind, config->args, "-kind", false, false);
 
@@ -188 +188 @@
     psString tess_id = NULL;
     if (warp_id) {
-        if (!p_psDBRunQuery(config->dbh, "SELECT * from diffRun WHERE diff_id = %" PRId64, (psS64)atoll(diff_id))) {
+        if (!p_psDBRunQuery(config->dbh, "SELECT * from diffRun WHERE diff_id = %" PRId64, diff_id)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             return false;
@@ -199 +199 @@
         }
         if (!psArrayLength(output)) {
-            psError(PS_ERR_UNKNOWN, false, "diff_id %" PRId64 " not found", (psS64)atoll(diff_id));
+            psError(PS_ERR_UNKNOWN, false, "diff_id %" PRId64 " not found", diff_id);
             psFree(output);
             return false;
@@ -215 +215 @@
 
     if (!diffInputSkyfileInsert(config->dbh,
-            (psS64)atoll(diff_id),
+            diff_id,
             template,
-            stack_id ? (psS64)atoll(stack_id) : PS_MAX_S64, // defined or NULL
-            warp_id ? (psS64)atoll(warp_id) : PS_MAX_S64, // defined or NULL
+            stack_id ? stack_id : PS_MAX_S64, // defined or NULL
+            warp_id ? warp_id : PS_MAX_S64, // defined or NULL
             skycell_id,
             tess_id,
@@ -230 +230 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, "SELECT count(diff_id) FROM diffRun JOIN diffInputSkyfile USING(diff_id) WHERE diff_id = %" PRId64, (psS64)atoll(diff_id))) {
+    if (!p_psDBRunQuery(config->dbh, "SELECT count(diff_id) FROM diffRun JOIN diffInputSkyfile USING(diff_id) WHERE diff_id = %" PRId64, diff_id)) {
         if (!psDBRollback(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -250 +250 @@
             psError(PS_ERR_UNKNOWN, false, "database error");
         }
-        psError(PS_ERR_UNKNOWN, false, "diff_id %" PRId64 " not found", (psS64)atoll(diff_id));
+        psError(PS_ERR_UNKNOWN, false, "diff_id %" PRId64 " not found", diff_id);
         psFree(output);
         return false;
@@ -333 +333 @@
 
     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, "diffInputSkyfile", !simple)) {
@@ -407 +401 @@
 
     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, "diffSkyfile", !simple)) {
@@ -432 +420 @@
 
     // required
-    PXOPT_LOOKUP_STR(diff_id, config->args, "-diff_id", true, false);
+    PXOPT_LOOKUP_S64(diff_id, config->args, "-diff_id", true, false);
 
     // default to 0
@@ -465 +453 @@
 
     if (!diffSkyfileInsert(config->dbh,
-                           (psS64)atoll(diff_id),
+                           diff_id,
                            uri,
                            path_base,
@@ -557 +545 @@
 
     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, "diffSkyfile", !simple)) {
@@ -609 +591 @@
 
 
-static bool setdiffRunState(pxConfig *config, const char *diff_id, const char *state)
-{
-    PS_ASSERT_PTR_NON_NULL(diff_id, false);
+static bool setdiffRunState(pxConfig *config, psS64 diff_id, const char *state)
+{
     PS_ASSERT_PTR_NON_NULL(state, false);
 
@@ -626 +607 @@
     }
 
-    char *query = "UPDATE diffRun SET state = '%s' WHERE diff_id = '%s'";
+    char *query = "UPDATE diffRun SET state = '%s' WHERE diff_id = %"PRId64;
     if (!p_psDBRunQuery(config->dbh, query, state, diff_id)) {
         psError(PS_ERR_UNKNOWN, false,
-                "failed to change state for diff_id %s", diff_id);
+                "failed to change state for diff_id %"PRId64, diff_id);
         return false;
     }
@@ -766 +747 @@
 
     // optional
-    PXOPT_LOOKUP_STR(template_stack_id, config->args, "-template_stack_id", false, false);
-    PXOPT_LOOKUP_STR(template_warp_id, config->args, "-template_warp_id", false, false);
+    PXOPT_LOOKUP_S64(template_stack_id, config->args, "-template_stack_id", false, false);
+    PXOPT_LOOKUP_S64(template_warp_id, config->args, "-template_warp_id", false, false);
 
     if (template_stack_id && template_warp_id) {
@@ -779 +760 @@
     }
 
-    PXOPT_LOOKUP_STR(input_stack_id, config->args, "-input_stack_id", false, false);
-    PXOPT_LOOKUP_STR(input_warp_id, config->args, "-input_warp_id", false, false);
+    PXOPT_LOOKUP_S64(input_stack_id, config->args, "-input_stack_id", false, false);
+    PXOPT_LOOKUP_S64(input_warp_id, config->args, "-input_warp_id", false, false);
     if (input_stack_id && input_warp_id) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Only one input can be defined.");
@@ -792 +773 @@
 
     return populatedrun(workdir, skycell_id, tess_id,
-                        input_warp_id ? (psS64)atoll(input_warp_id) : PS_MAX_S64,
-                        input_stack_id ? (psS64)atoll(input_stack_id) : PS_MAX_S64,
-                        template_warp_id ? (psS64)atoll(template_warp_id) : PS_MAX_S64,
-                        template_stack_id ? (psS64)atoll(template_stack_id) : PS_MAX_S64,
+                        input_warp_id ? input_warp_id : PS_MAX_S64,
+                        input_stack_id ? input_stack_id : PS_MAX_S64,
+                        template_warp_id ? template_warp_id : PS_MAX_S64,
+                        template_stack_id ? template_stack_id : PS_MAX_S64,
                         config);