Changeset 25816 for trunk/ippTools/src/pxadd.c

Timestamp:

Oct 8, 2009, 5:09:53 PM (17 years ago)

Author:

eugene

Message:

updates to the addstar stage; modify flatcorr to interact correctly with the addstar stage

File:

• trunk/ippTools/src/pxadd.c (modified) (4 diffs)

trunk/ippTools/src/pxadd.c

@@ -29 +29 @@
 #include "pxadd.h"
 
-bool pxaddRunSetState(pxConfig *config, psS64 add_id, const char *state, psS64 magicked)
+bool pxaddRunSetState(pxConfig *config, psS64 add_id, const char *state)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -41 +41 @@
     }
 
-    char *query = "UPDATE addRun SET state = '%s', magicked = %" PRId64 " WHERE add_id = %" PRId64;
-    if (!p_psDBRunQueryF(config->dbh, query, state, magicked, add_id)) {
-        psError(PS_ERR_UNKNOWN, false,
-                "failed to change state for add_id %" PRId64, add_id);
+    char *query = "UPDATE addRun SET state = '%s' WHERE add_id = %" PRId64;
+    if (!p_psDBRunQueryF(config->dbh, query, state, add_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to change state for add_id %" PRId64, add_id);
         return false;
     }
@@ -123 +122 @@
 }
 
-// Need to think more about this to see what we want it to do. BROKEN
 bool pxaddQueueByCamID(pxConfig *config,
                        psS64 cam_id,
                        char *workdir,
+                       char *reduction,
                        char *label,
-                       char *recipe,
-                       char *dvodb)
+                       char *dvodb,
+                       bool image_only)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -149 +148 @@
     if (!p_psDBRunQueryF(config->dbh, query,
                          "new", // state
-                         workdir  ? workdir  : "NULL",
+                         workdir  ? workdir   : "NULL",
                          "dirty", //workdir_state
-                         label    ? label    : "NULL",
-                         dvodb    ? dvodb    : "NULL",
-                         (long long)cam_id
+                         reduction? reduction : "NULL",
+                         label    ? label     : "NULL",
+                         dvodb    ? dvodb     : "NULL",
+                         image_only,
+                         (long long) cam_id
     )) {
         psError(PS_ERR_UNKNOWN, false, "database error");