Changeset 27207

Timestamp:

Mar 5, 2010, 1:02:51 PM (16 years ago)

Author:

Paul Price

Message:

Don't copy only if destreak run is already defined with the same label (and rerun isn't on).

Location:

trunk/ippTools

Files:

• share/magicdstool_definecopy_chip.sql (modified) (1 diff)
• share/magicdstool_definecopy_warp.sql (modified) (1 diff)
• src/magicdstool.c (modified) (1 diff)

trunk/ippTools/share/magicdstool_definecopy_chip.sql

@@ -27 +27 @@
         ON magicRun.magic_id = magicDSRun.magic_id
         AND magicDSRun.stage  = 'chip'
+        AND magicDSRun.label = '%s'
 WHERE magicRun.state = 'full'
     -- HOOK: NEWLINE HERE TO ACTIVATE %s AND magicDSRun.magic_ds_id IS NULL

trunk/ippTools/share/magicdstool_definecopy_warp.sql

@@ -29 +29 @@
         ON magicRun.magic_id = magicDSRun.magic_id
         AND magicDSRun.stage  = 'warp'
+        AND magicDSRun.label = '%s'
 WHERE magicRun.state = 'full'
     -- HOOK: NEWLINE HERE TO ACTIVATE %s AND magicDSRun.magic_ds_id IS NULL

trunk/ippTools/src/magicdstool.c

@@ -408 +408 @@
             psFree(limitString);
         }
-        if (!p_psDBRunQueryF(config->dbh, query, rerun_flag)) {
+        if (!p_psDBRunQueryF(config->dbh, query, set_label, rerun_flag)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(query);