IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 31375 for trunk/ippTools/share


Ignore:
Timestamp:
Apr 25, 2011, 2:59:55 PM (15 years ago)
Author:
heather
Message:

merging in addstar changes to the trunk

Location:
trunk/ippTools/share
Files:
7 edited
15 copied

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/Makefile.am

    r31236 r31375  
    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 \
     12        addtool_find_stack_id_dvo.sql \
     13        addtool_find_stack_id.sql \
    1014        addtool_find_pendingexp.sql \
     15        addtool_find_pendingexp_cam.sql \
     16        addtool_find_pendingexp_stack.sql \
     17        addtool_find_pendingexp_staticsky.sql \
    1118        addtool_find_pendingmergeprocess.sql \
    12         addtool_find_processedexp.sql \
     19        addtool_find_processedexp_cam.sql \
     20        addtool_find_processedexp_stack.sql \
     21        addtool_find_processedexp_staticsky.sql \
    1322        addtool_find_minidvodbprocessed.sql \
    1423        addtool_find_minidvodbrun.sql \
    … …  
    1625        addtool_pendingcleanuprun.sql \
    1726        addtool_queue_cam_id.sql \
     27        addtool_queue_stack_id.sql \
     28        addtool_queue_sky_id.sql \
    1829        addtool_queue_minidvodbrun.sql \
    1930        addtool_revertminidvodbprocessed.sql \
    20         addtool_revertprocessedexp.sql \
     31        addtool_revertprocessedexp_cam.sql \
     32        addtool_revertprocessedexp_stack.sql \
     33        addtool_revertprocessedexp_staticsky.sql \
    2134        bgtool_advancechip.sql \
    2235        bgtool_advancewarp.sql \

  • trunk/ippTools/share/addtool_find_cam_id.sql

    r29407 r31375  
    1111                  addRun.dvodb AS previous_dvodb
    1212           FROM addRun
    13            JOIN camRun USING(cam_id)
     13           JOIN camRun on cam_id=stage_id
    1414           JOIN chipRun USING(chip_id)
    1515          ) as foo
    1616     ON exp_id = added_exp_id
     17     AND stage = 'cam'
    1718     -- hook for qualifying the join on the previous_dvodb
    1819     AND %s

  • trunk/ippTools/share/addtool_find_cam_id_dvo.sql

    r29407 r31375  
    66    AND exp_id NOT IN (SELECT exp_id
    77       FROM addRun
    8        JOIN camRun USING(cam_id)
     8       JOIN camRun on cam_id=stage_id
    99       JOIN chipRun USING(chip_id)
    10        WHERE %s
     10       WHERE stage = 'cam' AND %s
    1111      )

  • trunk/ippTools/share/addtool_find_pendingexp.sql

    r25816 r31375  
    11SELECT
    2     addRun.*,
    3     camProcessedExp.path_base as camroot,
    4     rawExp.exp_tag,
    5     rawExp.exp_id,
    6     rawExp.exp_name,
    7     rawExp.camera,
    8     rawExp.telescope,
    9     rawExp.filelevel
     2    addRun.*
    103FROM addRun
    11 JOIN camRun
    12     USING(cam_id)
    13 JOIN camProcessedExp
    14     USING(cam_id)
    15 JOIN chipRun
    16     USING(chip_id)
    17 JOIN rawExp
    18     USING(exp_id)
    194LEFT JOIN addProcessedExp
    205    USING(add_id)
    … …  
    227    ON addRun.label = addMask.label
    238WHERE
    24     camRun.state = 'full'
    25     AND ((addRun.state = 'new' AND addProcessedExp.add_id IS NULL) OR addRun.state = 'update')
     9((addRun.state = 'new' AND addProcessedExp.add_id IS NULL) OR addRun.state = 'update')
    2610    AND addRun.dvodb IS NOT NULL
    2711    AND addRun.workdir IS NOT NULL

  • trunk/ippTools/share/addtool_queue_cam_id.sql

    r28181 r31375  
    22    SELECT
    33        0,              -- add_id
    4         cam_id,         -- cam_id
     4        'cam',          -- stage
     5        cam_id,         -- stage_id
    56        '%s',           -- state
    67        '%s',           -- workdir

  • trunk/ippTools/share/camtool_find_pendingimfile.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • trunk/ippTools/share/pxadmin_create_tables.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.