Changeset 24937

Timestamp:

Jul 29, 2009, 10:49:31 AM (17 years ago)

Author:

bills

Message:

add -streaks_max to magicdstool -definebyquery
enable -definebyquery, fix a bug

Location:

trunk/ippTools

Files:

• share/magicdstool_definebyquery_camera.sql (modified) (1 diff)
• share/magicdstool_definebyquery_chip.sql (modified) (1 diff)
• share/magicdstool_definebyquery_diff.sql (modified) (1 diff)
• share/magicdstool_definebyquery_raw.sql (modified) (1 diff)
• share/magicdstool_definebyquery_warp.sql (modified) (1 diff)
• src/magicdstool.c (modified) (3 diffs)
• src/magicdstoolConfig.c (modified) (1 diff)

trunk/ippTools/share/magicdstool_definebyquery_camera.sql

@@ -8 +8 @@
     magicRun.workdir
 FROM magicRun
+    JOIN magicMask USING(magic_id)
     JOIN diffRun USING(diff_id)
     JOIN diffInputSkyfile USING(diff_id)

trunk/ippTools/share/magicdstool_definebyquery_chip.sql

@@ -8 +8 @@
     magicRun.workdir
 FROM magicRun
+    JOIN magicMask USING(magic_id)
     JOIN diffRun USING(diff_id)
     JOIN diffInputSkyfile USING(diff_id)

trunk/ippTools/share/magicdstool_definebyquery_diff.sql

@@ -8 +8 @@
     magicRun.workdir
 FROM magicRun
+    JOIN magicMask USING(magic_id)
     JOIN diffRun USING(diff_id)
     LEFT JOIN magicDSRun ON magicRun.magic_id = magicDSRun.magic_id

trunk/ippTools/share/magicdstool_definebyquery_raw.sql

@@ -8 +8 @@
     magicRun.workdir
 FROM magicRun
+    JOIN magicMask USING(magic_id)
     JOIN diffRun USING(diff_id)
     JOIN diffInputSkyfile USING(diff_id)

trunk/ippTools/share/magicdstool_definebyquery_warp.sql

@@ -8 +8 @@
     magicRun.workdir
 FROM magicRun
+    JOIN magicMask USING(magic_id)
     JOIN diffRun USING(diff_id)
     JOIN diffInputSkyfile USING(diff_id)

trunk/ippTools/src/magicdstool.c

@@ -120 +120 @@
     PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "==");
     PXOPT_COPY_S64(config->args, where, "-magic_id","magic_id", "==");
+    PXOPT_COPY_S32(config->args, where, "-streaks_max","streaks", "<=");
 
     pxAddLabelSearchArgs (config, where, "-label", "magicRun.label", "==");
@@ -166 +167 @@
     }
     psFree(where);
-
-    dry_run = true;
 
     // treat limit == 0 as "no limit"
@@ -258 +257 @@
                 }
                 return false;
-                psS64 magic_ds_id = psDBLastInsertID(config->dbh); // Assigned identifier
-                run->magic_ds_id = magic_ds_id;
             }
+            psS64 magic_ds_id = psDBLastInsertID(config->dbh); // Assigned identifier
+            run->magic_ds_id = magic_ds_id;
         }
 

trunk/ippTools/src/magicdstoolConfig.c

@@ -62 +62 @@
     psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-diff_id",  0, "search by diff_id", 0);
     psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic_id", 0);
+    psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-streaks_max", 0, "maximum number of streaks", 0);
 
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-rerun",   0, "queue a new run even if one arleady exists", false);