Changeset 36411

Timestamp:

Dec 24, 2013, 1:28:47 PM (13 years ago)

Author:

bills

Message:

more changes due to the reworked tables

Location:

branches/bills_branches/bills_201312/ippTools

Files:

• share/fftool_todo.sql (modified) (2 diffs)
• src/fftool.c (modified) (1 diff)

branches/bills_branches/bills_201312/ippTools/share/fftool_todo.sql

@@ -1 +1 @@
 SELECT
     fullForceRun.*,
+    fullForceInput.warp_id,
     stackRun.tess_id,
     stackRun.skycell_id,
@@ -16 +17 @@
     JOIN chipRun USING(chip_id)
     JOIN rawExp USING(exp_id)
-    LEFT JOIN fullForceResult USING(ff_id)
+    LEFT JOIN fullForceResult USING(ff_id, warp_id)
 WHERE fullForceRun.state = 'new'
     AND fullForceResult.ff_id IS NULL

branches/bills_branches/bills_201312/ippTools/src/fftool.c

@@ -453 +453 @@
     // optional
     PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false);
+    PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", true, false);
     PXOPT_LOOKUP_F32(dtime_script, config->args, "-dtime_script", false, false);
-    PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
     PXOPT_LOOKUP_STR(software_ver, config->args, "-software_ver", false, false);