Changeset 28428 for trunk/ippTools/src

Timestamp:

Jun 22, 2010, 10:02:25 PM (16 years ago)

Author:

Paul Price

Message:

Make diffphot respect/propagate magic status. No 'destreaking' set up to run on diffphot yet; we just inherit the magic status of the parent diffRun.

Location:

trunk/ippTools/src

Files:

• diffphottool.c (modified) (2 diffs)
• diffphottoolConfig.c (modified) (1 diff)

trunk/ippTools/src/diffphottool.c

@@ -371 +371 @@
     PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false);
     PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false);
+    PXOPT_LOOKUP_S64(magicked, config->args, "-magicked", false, false);
 
     psString version = pxMergeCodeVersions(ver_pslib, ver_psmodules);
@@ -377 +378 @@
 
     if (!diffPhotSkyfileInsert(config->dbh, diff_phot_id, skycell_id, path_base, dtime_script, hostname,
-                               fault, quality, version)) {
+                               fault, quality, version, magicked)) {
         psError(psErrorCodeLast(), false, "database error");
         return false;

trunk/ippTools/src/diffphottoolConfig.c

@@ -100 +100 @@
     psMetadataAddStr(doneArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL);
     psMetadataAddStr(doneArgs, PS_LIST_TAIL, "-ver_psphot", 0, "define psphot version", NULL);
+    psMetadataAddS64(doneArgs, PS_LIST_TAIL, "-magicked", 0, "define magicked state", 0);
 
     // -advance