Index: trunk/ippMonitor/Makefile.in =================================================================== --- trunk/ippMonitor/Makefile.in (revision 40843) +++ trunk/ippMonitor/Makefile.in (revision 40844) @@ -169,8 +169,8 @@ $(DESTWWW)/fullforceFailedSkyfile.php \ $(DESTWWW)/fullforceProcessedSkyfile.php \ +$(DESTWWW)/fullforceInputSkyfile.php \ $(DESTWWW)/fullforceRun.php \ $(DESTWWW)/fullforceSummary.php \ -$(DESTWWW)/fullforce_failure.php \ -$(DESTWWW)/failedFullForceSkyfiles.php \ +$(DESTWWW)/failedFullforce.php \ $(DESTWWW)/diffSummary.php \ $(DESTWWW)/diffSummary_Images.php \ Index: trunk/ippMonitor/def/failedStaticsky.d =================================================================== --- trunk/ippMonitor/def/failedStaticsky.d (revision 40843) +++ trunk/ippMonitor/def/failedStaticsky.d (revision 40844) @@ -2,5 +2,5 @@ TITLE Static Sky Failed FILE failedStaticsky.php -MENU ipp.stack.dat +MENU ipp.sky.dat WHERE staticskyResult.fault != 0 Index: trunk/ippMonitor/def/fullforceFailedSkyfile.d =================================================================== --- trunk/ippMonitor/def/fullforceFailedSkyfile.d (revision 40843) +++ trunk/ippMonitor/def/fullforceFailedSkyfile.d (revision 40844) @@ -1,26 +1,22 @@ -TABLE staticskyInput, staticskyRun, stackRun, staticskyResult -TITLE Static Sky Processed -FILE staticskyFailedSkyfile.php -MENU ipp.stack.dat +TABLE fullForceInput, fullForceRun, warpRun, fullForceResult +TITLE Full Force Failed +FILE fullforceFailedSkyfile.php +MENU ipp.ffs.dat -WHERE staticskyRun.sky_id = staticskyInput.sky_id -WHERE staticskyInput.stack_id = stackRun.stack_id -WHERE staticskyInput.sky_id = staticskyResult.sky_id -WHERE staticskyResult.fault != 0 +WHERE fullForceRun.ff_id = fullForceInput.ff_id +WHERE fullForceInput.warp_id = warpRun.warp_id +WHERE fullForceInput.ff_id = fullForceResult.ff_id +WHERE fullForceResult.fault != 0 # field size format name show link to extras -FIELD staticskyRun.sky_id, 5, %s, Sky ID -FIELD staticskyRun.label, 7, %s, Label -FIELD staticskyRun.state, 7, %s, State -FIELD stackRun.stack_id, 5, %s, Stack ID -FIELD stackRun.skycell_id, 5, %s, Skycell ID -FIELD stackRun.tess_id, 5, %s, Tess ID -FIELD stackRun.filter, 5, %s, Filter -FIELD stackRun.label, 5, %s, Stack Label -FIELD staticskyRun.data_group, 7, %s, data grp -FIELD staticskyRun.dist_group, 7, %s, dist grp -FIELD staticskyResult.dtime_phot, 7, %.2f, t(phot) -FIELD staticskyResult.dtime_script, 7, %.2f, t(script) -FIELD staticskyResult.sources, 7, %d, n(sources) -FIELD staticskyResult.fault, 7, %d, fault -FIELD staticskyResult.quality, 7, %d, quality +FIELD fullForceRun.ff_id, 5, %s, FF ID +FIELD fullForceRun.label, 7, %s, Label +FIELD fullForceRun.state, 7, %s, State +FIELD warpRun.warp_id, 5, %s, Warp ID +FIELD warpRun.tess_id, 5, %s, Tess ID +FIELD warpRun.label, 5, %s, warp Label +FIELD fullForceRun.data_group, 7, %s, data grp +FIELD fullForceRun.dist_group, 7, %s, dist grp +FIELD fullForceResult.dtime_script, 7, %.2f, t(script) +FIELD fullForceResult.fault, 7, %d, fault +FIELD fullForceResult.quality, 7, %d, quality Index: trunk/ippMonitor/def/fullforceProcessedSkyfile.d =================================================================== --- trunk/ippMonitor/def/fullforceProcessedSkyfile.d (revision 40843) +++ trunk/ippMonitor/def/fullforceProcessedSkyfile.d (revision 40844) @@ -1,25 +1,21 @@ -TABLE staticskyInput, staticskyRun, stackRun, staticskyResult -TITLE Static Sky Processed -FILE staticskyProcessedSkyfile.php -MENU ipp.stack.dat +TABLE fullForceInput, fullForceRun, warpRun, fullForceResult +TITLE Full Force Processed +FILE fullforceProcessedSkyfile.php +MENU ipp.ffs.dat -WHERE staticskyRun.sky_id = staticskyInput.sky_id -WHERE staticskyInput.stack_id = stackRun.stack_id -WHERE staticskyInput.sky_id = staticskyResult.sky_id +WHERE fullForceRun.ff_id = fullForceInput.ff_id +WHERE fullForceInput.warp_id = warpRun.warp_id +WHERE fullForceInput.ff_id = fullForceResult.ff_id # field size format name show link to extras -FIELD staticskyRun.sky_id, 5, %s, Sky ID -FIELD staticskyRun.label, 7, %s, Label -FIELD staticskyRun.state, 7, %s, State -FIELD stackRun.stack_id, 5, %s, Stack ID -FIELD stackRun.skycell_id, 5, %s, Skycell ID -FIELD stackRun.tess_id, 5, %s, Tess ID -FIELD stackRun.filter, 5, %s, Filter -FIELD stackRun.label, 5, %s, Stack Label -FIELD staticskyRun.data_group, 7, %s, data grp -FIELD staticskyRun.dist_group, 7, %s, dist grp -FIELD staticskyResult.dtime_phot, 7, %.2f, t(phot) -FIELD staticskyResult.dtime_script, 7, %.2f, t(script) -FIELD staticskyResult.sources, 7, %d, n(sources) -FIELD staticskyResult.fault, 7, %d, fault -FIELD staticskyResult.quality, 7, %d, quality +FIELD fullForceRun.ff_id, 5, %s, FF ID +FIELD fullForceRun.label, 7, %s, Label +FIELD fullForceRun.state, 7, %s, State +FIELD warpRun.warp_id, 5, %s, Warp ID +FIELD warpRun.tess_id, 5, %s, Tess ID +FIELD warpRun.label, 5, %s, warp Label +FIELD fullForceRun.data_group, 7, %s, data grp +FIELD fullForceRun.dist_group, 7, %s, dist grp +FIELD fullForceResult.dtime_script, 7, %.2f, t(script) +FIELD fullForceResult.fault, 7, %d, fault +FIELD fullForceResult.quality, 7, %d, quality Index: trunk/ippMonitor/def/fullforceRun.d =================================================================== --- trunk/ippMonitor/def/fullforceRun.d (revision 40843) +++ trunk/ippMonitor/def/fullforceRun.d (revision 40844) @@ -1,15 +1,12 @@ -TABLE staticskyRun -TITLE staticskyRun -FILE staticskyRun.php -MENU ipp.stack.dat +TABLE fullForceRun +TITLE fullforceRun +FILE fullforceRun.php +MENU ipp.ffs.dat # field size format name show link to extras -FIELD sky_id, 5, %s, Sky ID -# FIELD skycell_id, 5, %s, Skycell ID +FIELD ff_id, 5, %s, Fullforce ID +FIELD skycal_id, 5, %s, Skycal ID FIELD label, 5, %s, Label FIELD data_group, 5, %s, Data grp FIELD dist_group, 5, %s, Dist grp FIELD state, 5, %s, State - -#FIELD registered, 5, %s, time registered -#FIELD workdir, 10, %s, workdir Index: trunk/ippMonitor/def/fullforceSummary.d =================================================================== --- trunk/ippMonitor/def/fullforceSummary.d (revision 40843) +++ trunk/ippMonitor/def/fullforceSummary.d (revision 40844) @@ -1,6 +1,6 @@ -TABLE staticskyRun -TITLE Static Sky Summary -FILE staticskySummary.php -MENU ipp.stack.dat +TABLE fullForceRun +TITLE Full Force Summary +FILE fullforceSummary.php +MENU ipp.ffs.dat # field size format name show link to extras Index: trunk/ippMonitor/def/skycalFailedSkyfile.d =================================================================== --- trunk/ippMonitor/def/skycalFailedSkyfile.d (revision 40843) +++ trunk/ippMonitor/def/skycalFailedSkyfile.d (revision 40844) @@ -1,26 +1,18 @@ -TABLE staticskyInput, staticskyRun, stackRun, staticskyResult -TITLE Static Sky Processed -FILE staticskyFailedSkyfile.php +TABLE skycalRun, skycalResult, stackRun +TITLE Skycal Failed Skyfiles +FILE skycalfailedSkyfile.php MENU ipp.sky.dat -WHERE staticskyRun.sky_id = staticskyInput.sky_id -WHERE staticskyInput.stack_id = stackRun.stack_id -WHERE staticskyInput.sky_id = staticskyResult.sky_id -WHERE staticskyResult.fault != 0 +WHERE skycalRun.stack_id = stackRun.stack_id +WHERE skycalRun.skycal_id = skycalResult.skycal_id +WHERE skycalResult.fault != 0 -# field size format name show link to extras -FIELD staticskyRun.sky_id, 5, %s, Sky ID -FIELD staticskyRun.label, 7, %s, Label -FIELD staticskyRun.state, 7, %s, State -FIELD stackRun.stack_id, 5, %s, Stack ID -FIELD stackRun.skycell_id, 5, %s, Skycell ID -FIELD stackRun.tess_id, 5, %s, Tess ID -FIELD stackRun.filter, 5, %s, Filter -FIELD stackRun.label, 5, %s, Stack Label -FIELD staticskyRun.data_group, 7, %s, data grp -FIELD staticskyRun.dist_group, 7, %s, dist grp -FIELD staticskyResult.dtime_phot, 7, %.2f, t(phot) -FIELD staticskyResult.dtime_script, 7, %.2f, t(script) -FIELD staticskyResult.sources, 7, %d, n(sources) -FIELD staticskyResult.fault, 7, %d, fault -FIELD staticskyResult.quality, 7, %d, quality +# field size format name show link to extras +FIELD skycalRun.skycal_id, 5, %s, Sky ID +FIELD stackRun.stack_id, 5, %s, Stack ID +FIELD skycell_id, 5, %s, Skycell ID +FIELD filter, 5, %s, Filter +FIELD skycalRun.label, 5, %s, Label +FIELD skycalRun.data_group, 5, %s, Data grp +FIELD skycalRun.dist_group, 5, %s, Dist grp +FIELD skycalRun.state, 5, %s, State Index: trunk/ippMonitor/def/skycalProcessedSkyfile.d =================================================================== --- trunk/ippMonitor/def/skycalProcessedSkyfile.d (revision 40843) +++ trunk/ippMonitor/def/skycalProcessedSkyfile.d (revision 40844) @@ -6,16 +6,12 @@ WHERE skycalRun.stack_id = stackRun.stack_id WHERE skycalRun.skycal_id = skycalResult.skycal_id -WHERE skycalResult.fault != 0 - -RESTRICT_COUNT AND dateobs >= CURDATE() -UNRESTRICTED AND dateobs >= CURDATE() # field size format name show link to extras -FIELD skycal_id, 5, %s, Sky ID -FIELD stack_id, 5, %s, Stack ID +FIELD skycalRun.skycal_id, 5, %s, Sky ID +FIELD stackRun.stack_id, 5, %s, Stack ID FIELD skycell_id, 5, %s, Skycell ID FIELD filter, 5, %s, Filter FIELD skycalRun.label, 5, %s, Label -FIELD data_group, 5, %s, Data grp -FIELD dist_group, 5, %s, Dist grp -FIELD state, 5, %s, State +FIELD skycalRun.data_group, 5, %s, Data grp +FIELD skycalRun.dist_group, 5, %s, Dist grp +FIELD skycalRun.state, 5, %s, State Index: trunk/ippMonitor/def/skycalRun.d =================================================================== --- trunk/ippMonitor/def/skycalRun.d (revision 40843) +++ trunk/ippMonitor/def/skycalRun.d (revision 40844) @@ -7,10 +7,10 @@ # field size format name show link to extras -FIELD skycal_id, 5, %s, Sky ID -FIELD stack_id, 5, %s, Stack ID +FIELD skycalRun.skycal_id, 5, %s, Sky ID +FIELD stackRun.stack_id, 5, %s, Stack ID FIELD skycell_id, 5, %s, Skycell ID FIELD filter, 5, %s, Filter FIELD skycalRun.label, 5, %s, Label -FIELD data_group, 5, %s, Data grp -FIELD dist_group, 5, %s, Dist grp -FIELD state, 5, %s, State +FIELD skycalRun.data_group, 5, %s, Data grp +FIELD skycalRun.dist_group, 5, %s, Dist grp +FIELD skycalRun.state, 5, %s, State Index: trunk/ippMonitor/def/skycalSummary.d =================================================================== --- trunk/ippMonitor/def/skycalSummary.d (revision 40843) +++ trunk/ippMonitor/def/skycalSummary.d (revision 40844) @@ -5,12 +5,12 @@ # field size format name show link to extras -FIELD label, 15, %s, label -FIELD data_group, 10, %s, data_group +FIELD skycalRun.label, 15, %s, label +FIELD skycalRun.data_group, 10, %s, data_group FIELD workdir, 7, %s, workdir -FIELD state, 7, %s, state +FIELD skycalRun.state, 7, %s, state FIELD count(state) as n, 7, %d, count MODE summary -GROUP state -GROUP label +GROUP skycalRun.state +GROUP skycalRun.label GROUP workdir Index: trunk/ippMonitor/def/skycal_failure.d =================================================================== --- trunk/ippMonitor/def/skycal_failure.d (revision 40843) +++ trunk/ippMonitor/def/skycal_failure.d (revision 40844) @@ -11,12 +11,12 @@ # field size format name show link to extras -FIELD skycal_id, 5, %s, Sky ID -FIELD stack_id, 5, %s, Stack ID +FIELD skycalRun.skycal_id, 5, %s, Sky ID +FIELD stackRun.stack_id, 5, %s, Stack ID FIELD skycell_id, 5, %s, Skycell ID FIELD filter, 5, %s, Filter FIELD skycalRun.label, 5, %s, Label -FIELD data_group, 5, %s, Data grp -FIELD dist_group, 5, %s, Dist grp -FIELD state, 5, %s, State, value, skycal_failure.php, ARG1 +FIELD skycalRun.data_group, 5, %s, Data grp +FIELD skycalRun.dist_group, 5, %s, Dist grp +FIELD skycalRun.state, 5, %s, State, value, skycal_failure.php, ARG1 TAIL PHP insert_log ('LOG.EXP'); Index: trunk/ippMonitor/def/staticskyFailedSkyfile.d =================================================================== --- trunk/ippMonitor/def/staticskyFailedSkyfile.d (revision 40843) +++ trunk/ippMonitor/def/staticskyFailedSkyfile.d (revision 40844) @@ -1,4 +1,4 @@ TABLE staticskyInput, staticskyRun, stackRun, staticskyResult -TITLE Static Sky Processed +TITLE Static Sky Failed FILE staticskyFailedSkyfile.php MENU ipp.sky.dat