IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 33525 for trunk/ippTools/share


Ignore:
Timestamp:
Mar 14, 2012, 3:05:17 PM (14 years ago)
Author:
heather
Message:

dvodb changes: staticsky and staticsky_multi are now just staticsky

Location:
trunk/ippTools/share
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/ippTools/share/Makefile.am

    r33030 r33525  
    88        addtool_find_cam_id_dvo.sql \
    99        addtool_find_cam_id.sql \
    10         addtool_find_sky_id_dvo.sql \
    11         addtool_find_sky_id.sql \
    1210        addtool_find_sky_id_multi_dvo.sql \
    1311        addtool_find_sky_id_multi.sql \
     
    1715        addtool_find_pendingexp_cam.sql \
    1816        addtool_find_pendingexp_stack.sql \
    19         addtool_find_pendingexp_staticsky.sql \
    2017        addtool_find_pendingexp_staticsky_multi.sql \
    2118        addtool_find_pendingmergeprocess.sql \
    2219        addtool_find_processedexp_cam.sql \
    2320        addtool_find_processedexp_stack.sql \
    24         addtool_find_processedexp_staticsky.sql \
    2521        addtool_find_processedexp_staticsky_multi.sql \
    2622        addtool_find_minidvodbprocessed.sql \
     
    3026        addtool_queue_cam_id.sql \
    3127        addtool_queue_stack_id.sql \
    32         addtool_queue_sky_id.sql \
    3328        addtool_queue_sky_id_multi.sql \
    3429        addtool_queue_minidvodbrun.sql \
  • trunk/ippTools/share/addtool_find_pendingexp_staticsky_multi.sql

    r32832 r33525  
    2525WHERE
    2626    staticskyRun.state = 'full'
    27     AND stage = 'staticsky_multi'
     27    AND stage = 'staticsky'
    2828    AND ((addRun.state = 'new' AND addProcessedExp.add_id IS NULL) OR addRun.state = 'update')
    2929    AND addRun.dvodb IS NOT NULL
  • trunk/ippTools/share/addtool_find_sky_id.sql

    r31596 r33525  
    22    staticskyRun.*
    33FROM
    4      staticskyResult
    5 join staticskyRun using (sky_id)
     4     staticskyRun
     5join staticskyResult using (sky_id)
    66join staticskyInput using(sky_id)
    77JOIN stackRun USING(stack_id)
     
    1919    staticskyRun.state = 'full'
    2020    AND staticskyResult.quality = 0
    21     AND added_exp_id IS NULL
     21    AND added_sky_id IS NULL
    2222    -- addtool adds checks on exposure being added to the dvodb previously
  • trunk/ippTools/share/addtool_find_sky_id_dvo.sql

    r31596 r33525  
    1 SELECT staticskyRun.* FROM staticskyResult
    2 JOIN staticskyRun USING(sky_id)
     1SELECT staticskyRun.* FROM staticskyRun
     2JOIN staticskyResult USING(sky_id)
    33join staticskyInput using(sky_id)
    44JOIN stackRun USING(stack_id)
    55
    66WHERE staticskyRun.state = 'full' and staticskyResult.quality = 0
    7     AND sky_id NOT IN (SELECT sky_id
     7    AND stack_id NOT IN (SELECT stack_id
    88       FROM addRun
    99       JOIN staticskyResult on staticskyResult.sky_id = addRun.stage_id
    1010       JOIN staticskyRun USING(sky_id)
     11       JOIN staticskyInput USING(sky_id)
    1112       WHERE addRun.stage = 'staticsky' AND %s
    1213      )
  • trunk/ippTools/share/addtool_find_sky_id_multi.sql

    r32832 r33525  
    44    staticskyResult.num_inputs
    55FROM
    6      staticskyResult
    7 join staticskyRun using (sky_id)
     6     staticskyRun
     7join staticskyResult using (sky_id)
    88join staticskyInput using(sky_id)
    99JOIN stackRun USING(stack_id)
    1010
    11 LEFT JOIN (SELECT sky_id       AS added_sky_id,
     11LEFT JOIN (SELECT stack_id       AS added_stack_id,
    1212                  addRun.dvodb AS previous_dvodb
    1313           FROM addRun
    1414JOIN staticskyRun on sky_id = stage_id
    1515          ) as foo
    16      ON sky_id = added_sky_id
    17      AND stage = 'staticsky_multi'
     16     ON stack_id = added_stack_id
     17     AND stage = 'staticsky'
    1818     -- hook for qualifying the join on the previous_dvodb
    1919     AND %s
     
    2121    staticskyRun.state = 'full'
    2222    AND staticskyResult.quality = 0
    23     AND added_exp_id IS NULL
     23    AND added_stack_id IS NULL
    2424    -- addtool adds checks on exposure being added to the dvodb previously
  • trunk/ippTools/share/addtool_find_sky_id_multi_dvo.sql

    r32832 r33525  
    55
    66WHERE staticskyRun.state = 'full' and staticskyResult.quality = 0
    7     AND sky_id NOT IN (SELECT sky_id
     7    AND stack_id NOT IN (SELECT stack_id
    88       FROM addRun
    99       JOIN staticskyResult on staticskyResult.sky_id = addRun.stage_id
    1010       JOIN staticskyRun USING(sky_id)
    11        WHERE addRun.stage = 'staticsky_multi' AND %s
     11       JOIN staticskyInput USING(sky_id)
     12       WHERE addRun.stage = 'staticsky' AND %s
    1213      )
  • trunk/ippTools/share/addtool_queue_sky_id_multi.sql

    r32832 r33525  
    22    SELECT
    33        0,              -- add_id
    4         'staticsky_multi',              -- stage
     4        'staticsky',            -- stage
    55        sky_id,         -- stage_id
    66        %d,             -- stage_extra1
  • trunk/ippTools/share/addtool_revertprocessedexp_staticsky_multi.sql

    r32832 r33525  
    55    AND addProcessedExp.fault != 0
    66    AND addRun.state = 'new'
    7     AND addRun.stage = 'staticsky_multi'
     7    AND addRun.stage = 'staticsky'
Note: See TracChangeset for help on using the changeset viewer.