Changeset 28488

Timestamp:

Jun 24, 2010, 3:27:40 PM (16 years ago)

Author:

Paul Price

Message:

Adding column 'magicked' to diffPhotRun.

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/diffphot.md (modified) (1 diff)
• ippTools/share/diffphottool_advance.sql (modified) (1 diff)
• ippTools/src/diffphottool.c (modified) (2 diffs)

trunk/dbconfig/changes.txt

@@ -1864 +1864 @@
     registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered
     note VARCHAR(255),             -- note
+    magicked BIGINT NOT NULL DEFAULT 0, -- magic mask applied
     PRIMARY KEY(diff_phot_id),
     KEY(diff_id),

trunk/dbconfig/diffphot.md

@@ -10 +10 @@
     registered      TAI         NULL
     note            STR         255
+    magicked        S64         0
 END
 

trunk/ippTools/share/diffphottool_advance.sql

@@ -1 +1 @@
 SELECT
-    diff_phot_id
+    diff_phot_id,
+    diffPhotSkyfile.magicked
 FROM diffPhotRun
 JOIN diffSkyfile USING(diff_id)

trunk/ippTools/src/diffphottool.c

@@ -177 +177 @@
                                                   set_reduction ? set_reduction : reduction,
                                                   registered,
-                                                  set_note ? set_note : note);
+                                                  set_note ? set_note : note, 0);
         if (!diffPhotRunInsertObject(config->dbh, run)) {
             psError(psErrorCodeLast(), false, "database error");
@@ -430 +430 @@
         psMetadata *row = output->data[i]; // Row of interest
         psS64 diff_phot_id = psMetadataLookupS64(NULL, row, "diff_phot_id");
-
-        const char *query = "UPDATE diffPhotRun SET state = 'full' WHERE diff_phot_id = %" PRId64;
-        if (!p_psDBRunQueryF(config->dbh, query, diff_phot_id)) {
+        psS64 magicked = psMetadataLookupS64(NULL, row, "magicked");
+
+        const char *query = "UPDATE diffPhotRun SET state = 'full', magicked = %" PRId64
+            " WHERE diff_phot_id = %" PRId64;
+        if (!p_psDBRunQueryF(config->dbh, query, magicked, diff_phot_id)) {
             psError(psErrorCodeLast(), false,
                     "failed to change state for diff_phot_id %" PRId64, diff_phot_id);