Index: /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedexp.sql =================================================================== --- /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedexp.sql (revision 18991) +++ /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedexp.sql (revision 18991) @@ -0,0 +1,9 @@ +SELECT + detNormalizedExp.*, + detRunSummary.data_state, +FROM detRunSummary +JOIN detNormalizedExp + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detNormalizedExp.data_state = 'full' Index: /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql =================================================================== --- /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql (revision 18991) +++ /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql (revision 18991) @@ -0,0 +1,9 @@ +SELECT + detNormalizedImfile.*, + detRunSummary.data_state, +FROM detRunSummary +JOIN detNormalizedImfile + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detNormalizedImfile.data_state = 'full' Index: /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedstat.sql =================================================================== --- /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedstat.sql (revision 18991) +++ /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedstat.sql (revision 18991) @@ -0,0 +1,9 @@ +SELECT + detNormalizedStatImfile.*, + detRunSummary.data_state, +FROM detRunSummary +JOIN detNormalizedStatImfile + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detNormalizedStatImfile.data_state = 'full' Index: /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_processedexp.sql =================================================================== --- /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_processedexp.sql (revision 18991) +++ /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_processedexp.sql (revision 18991) @@ -0,0 +1,9 @@ +SELECT + detProcessedExp.*, + detRunSummary.data_state, +FROM detRunSummary +JOIN detProcessedExp + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detProcessedExp.data_state = 'full' Index: /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_processedimfile.sql =================================================================== --- /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_processedimfile.sql (revision 18990) +++ /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_processedimfile.sql (revision 18991) @@ -7,2 +7,3 @@ WHERE detRunSummary.data_state = 'goto_cleaned' +AND detProcessedImfile.data_state = 'full' Index: /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_residexp.sql =================================================================== --- /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_residexp.sql (revision 18991) +++ /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_residexp.sql (revision 18991) @@ -0,0 +1,9 @@ +SELECT + detProcessedImfile.*, + detRunSummary.data_state, +FROM detRunSummary +JOIN detProcessedImfile + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detProcessedImfile.data_state = 'full' Index: /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_residimfile.sql =================================================================== --- /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_residimfile.sql (revision 18991) +++ /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_residimfile.sql (revision 18991) @@ -0,0 +1,9 @@ +SELECT + detResidImfile.*, + detRunSummary.data_state, +FROM detRunSummary +JOIN detResidImfile + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detResidImfile.data_state = 'full' Index: /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_stacked.sql =================================================================== --- /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_stacked.sql (revision 18991) +++ /branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_stacked.sql (revision 18991) @@ -0,0 +1,9 @@ +SELECT + detStackedImfile.*, + detRunSummary.data_state, +FROM detRunSummary +JOIN detStackedImfile + USING(det_id,iteration) +WHERE + detRunSummary.data_state = 'goto_cleaned' +AND detStackedImfile.data_state = 'full' Index: /branches/eam_branch_20080719/ippTools/src/dettool.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool.c (revision 18991) @@ -39,5 +39,4 @@ static detInputExpRow *rawDetrenTodetInputExpRow(rawExpRow *rawExp, psS64 det_id, psS32 iteration); static psS32 incrementIteration(pxConfig *config, psS64 det_id); -static bool isValidMode(pxConfig *config, const char *mode); # define MODECASE(caseName, func) \ @@ -77,4 +76,5 @@ MODECASE(DETTOOL_MODE_PROCESSEDIMFILE, processedimfileMode); MODECASE(DETTOOL_MODE_REVERTPROCESSEDIMFILE, revertprocessedimfileMode); + MODECASE(DETTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode); MODECASE(DETTOOL_MODE_PENDINGCLEANUP_PROCESSEDIMFILE, pendingcleanup_processedimfileMode); MODECASE(DETTOOL_MODE_DONECLEANUP_PROCESSEDIMFILE, donecleanup_processedimfileMode); @@ -84,4 +84,5 @@ MODECASE(DETTOOL_MODE_PROCESSEDEXP, processedexpMode); MODECASE(DETTOOL_MODE_REVERTPROCESSEDEXP, revertprocessedexpMode); + MODECASE(DETTOOL_MODE_UPDATEPROCESSEDEXP, updateprocessedexpMode); MODECASE(DETTOOL_MODE_PENDINGCLEANUP_PROCESSEDEXP, pendingcleanup_processedexpMode); MODECASE(DETTOOL_MODE_DONECLEANUP_PROCESSEDEXP, donecleanup_processedexpMode); @@ -91,4 +92,5 @@ MODECASE(DETTOOL_MODE_STACKED, stackedMode); MODECASE(DETTOOL_MODE_REVERTSTACKED, revertstackedMode); + MODECASE(DETTOOL_MODE_UPDATESTACKED, updatestackedMode); MODECASE(DETTOOL_MODE_PENDINGCLEANUP_STACKED, pendingcleanup_stackedMode); MODECASE(DETTOOL_MODE_DONECLEANUP_STACKED, donecleanup_stackedMode); @@ -98,4 +100,5 @@ MODECASE(DETTOOL_MODE_NORMALIZEDSTAT, normalizedstatMode); MODECASE(DETTOOL_MODE_REVERTNORMALIZEDSTAT, revertnormalizedstatMode); + MODECASE(DETTOOL_MODE_UPDATENORMALIZEDSTAT, updatenormalizedstatMode); MODECASE(DETTOOL_MODE_PENDINGCLEANUP_NORMALIZEDSTAT, pendingcleanup_normalizedstatMode); MODECASE(DETTOOL_MODE_DONECLEANUP_NORMALIZEDSTAT, donecleanup_normalizedstatMode); @@ -105,4 +108,5 @@ MODECASE(DETTOOL_MODE_NORMALIZEDIMFILE, normalizedimfileMode); MODECASE(DETTOOL_MODE_REVERTNORMALIZEDIMFILE, revertnormalizedimfileMode); + MODECASE(DETTOOL_MODE_UPDATENORMALIZEDIMFILE, updatenormalizedimfileMode); MODECASE(DETTOOL_MODE_PENDINGCLEANUP_NORMALIZEDIMFILE, pendingcleanup_normalizedimfileMode); MODECASE(DETTOOL_MODE_DONECLEANUP_NORMALIZEDIMFILE, donecleanup_normalizedimfileMode); @@ -112,4 +116,5 @@ MODECASE(DETTOOL_MODE_NORMALIZEDEXP, normalizedexpMode); MODECASE(DETTOOL_MODE_REVERTNORMALIZEDEXP, revertnormalizedexpMode); + MODECASE(DETTOOL_MODE_UPDATENORMALIZEDEXP, updatenormalizedexpMode); MODECASE(DETTOOL_MODE_PENDINGCLEANUP_NORMALIZEDEXP, pendingcleanup_normalizedexpMode); MODECASE(DETTOOL_MODE_DONECLEANUP_NORMALIZEDEXP, donecleanup_normalizedexpMode); @@ -119,4 +124,5 @@ MODECASE(DETTOOL_MODE_RESIDIMFILE, residimfileMode); MODECASE(DETTOOL_MODE_REVERTRESIDIMFILE,revertresidimfileMode); + MODECASE(DETTOOL_MODE_UPDATERESIDIMFILE, updateresidimfileMode); MODECASE(DETTOOL_MODE_PENDINGCLEANUP_RESIDIMFILE, pendingcleanup_residimfileMode); MODECASE(DETTOOL_MODE_DONECLEANUP_RESIDIMFILE, donecleanup_residimfileMode); @@ -174,5 +180,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "=="); PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); @@ -688,5 +694,5 @@ - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required PXOPT_LOOKUP_STR(det_type, config->args, "-set_det_type", false, false); // optional PXOPT_LOOKUP_STR(mode, config->args, "-set_mode", false, false); // optional @@ -724,5 +730,5 @@ { psMetadata *where = psMetadataAlloc(); - psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", (psS64)atoll(det_id)); + psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", det_id); detRuns = detRunSelectRowObjects(config->dbh, where, 0); psFree(where); @@ -734,5 +740,5 @@ // sanity check the result... we should have only found one det_id if (psArrayLength(detRuns) != 1) { - psAbort("found more then one detRun matching det_id %" PRId64 " (this should not happen)", (psS64)atoll(det_id)); + psAbort("found more then one detRun matching det_id %" PRId64 " (this should not happen)", det_id); return false; // unreachable } @@ -905,5 +911,5 @@ psFree(time_filter); - if (!p_psDBRunQuery(config->dbh, query, (psS64)newDet_id, (psS64)atoll(det_id))) { + if (!p_psDBRunQuery(config->dbh, query, (psS64)newDet_id, det_id)) { psError(PS_ERR_UNKNOWN, false, "database error"); psFree(query); @@ -953,5 +959,5 @@ psMetadata *where = psMetadataAlloc(); PXOPT_COPY_STR(config->args, where, "-det_type", "det_type", "=="); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); @@ -1118,5 +1124,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); @@ -1221,5 +1227,5 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required PXOPT_LOOKUP_BOOL(again, config->args, "-again", false); PXOPT_LOOKUP_STR(state, config->args, "-state", false, false); @@ -1237,10 +1243,10 @@ if (state) { // set detRun.state to state - return setDetRunState(config, (psS64)atoll(det_id), state); + return setDetRunState(config, det_id, state); } // else // -again - if (!startNewIteration(config, (psS64)atoll(det_id))) { + if (!startNewIteration(config, det_id)) { psError(PS_ERR_UNKNOWN, false, "failed to start new iteration"); return false; @@ -1363,5 +1369,5 @@ // det_id is required - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // we have to support multipe exp_ids @@ -1408,6 +1414,5 @@ // add the det_id & iteration == 0 to the where clause - if (!psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", - (psS64)atoll(det_id))) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", det_id)) { psError(PS_ERR_UNKNOWN, false, "failed to add item det_id"); psFree(where); @@ -1446,5 +1451,5 @@ // up the detRuns iteration count - psS32 newIteration = incrementIteration(config, (psS64)atoll(det_id)); + psS32 newIteration = incrementIteration(config, det_id); if (!newIteration) { // rollback @@ -1470,5 +1475,5 @@ } // invalid exp_id - psError(PS_ERR_UNKNOWN, false, "exp_id %s is invalid for det_id %s", + psError(PS_ERR_UNKNOWN, false, "exp_id %s is invalid for det_id %" PRId64, (char *)mItem->data.V, det_id); psFree(iter); @@ -1477,5 +1482,5 @@ } detInputExpRow *newInputExp = detInputExpRowAlloc( - (psS64)atoll(det_id), + det_id, newIteration, inputExp->exp_id, @@ -1536,5 +1541,5 @@ PXOPT_LOOKUP_TIME(use_begin, config->args, "-use_begin", false, false); PXOPT_LOOKUP_TIME(use_end, config->args, "-use_end", false, false); - PXOPT_LOOKUP_STR(parent, config->args, "-parent", false, false); + PXOPT_LOOKUP_S64(parent, config->args, "-parent", false, false); PXOPT_LOOKUP_STR(label, config->args, "-label", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -1574,5 +1579,5 @@ solang_max, label, // label - parent ? (psS64)atoll(parent) : 0 + parent )) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -1625,5 +1630,5 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); // required PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false); // required @@ -1639,5 +1644,5 @@ if (!detRegisteredImfileInsert(config->dbh, - (psS64)atoll(det_id), + det_id, 0, // the iteration is fixed at 0 class_id, @@ -1727,5 +1732,17 @@ } -static bool isValidMode(pxConfig *config, const char *mode) +bool isValidDataState (const char *data_state) { + + // check that state is a valid string value + if (!strncmp(data_state, "run", 4)) return true; + if (!strncmp(data_state, "stop", 5)) return true; + if (!strncmp(data_state, "drop", 5)) return true; + if (!strncmp(data_state, "register", 4)) return true; + + psError(PS_ERR_UNKNOWN, true, "invalid data state: %s", data_state); + return false; +} + +bool isValidMode(pxConfig *config, const char *mode) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -1746,4 +1763,175 @@ } + +bool setProcessedImfileDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *class_id, const char *data_state) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(data_state, false); + PS_ASSERT_PTR_NON_NULL(class_id, false); + + if (!isValidDataState (data_state)) return false; + + char *query = "UPDATE detProcessedImfile SET data_state = '%s'" + " WHERE det_id = %" PRId64 + " AND exp_id = %" PRId64 + " AND class_id = '%s'"; + if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, exp_id, class_id)) { + psError(PS_ERR_UNKNOWN, false, + "failed to change state for det_id %" PRId64 ", exp_id %" PRId64 ", class_id %s", + det_id, exp_id, class_id); + return false; + } + + return true; +} + +bool setProcessedExpDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *data_state) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(data_state, false); + + if (!isValidDataState (data_state)) return false; + + char *query = "UPDATE detProcessedExp SET data_state = '%s'" + " WHERE det_id = %" PRId64 + " AND exp_id = %" PRId64; + if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, exp_id)) { + psError(PS_ERR_UNKNOWN, false, + "failed to change state for det_id %" PRId64 ", exp_id %" PRId64, + det_id, exp_id); + return false; + } + + return true; +} + + +bool setStackedImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *data_state) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(data_state, false); + + if (!isValidDataState (data_state)) return false; + + char *query = "UPDATE detStackedImfile SET data_state = '%s'" + " WHERE det_id = %" PRId64 + " AND iteration = %" PRId32; + if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration)) { + psError(PS_ERR_UNKNOWN, false, + "failed to change state for det_id %" PRId64 ", iteration %" PRId32, + det_id, iteration); + return false; + } + + return true; +} + +bool setNormStatImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(class_id, false); + PS_ASSERT_PTR_NON_NULL(data_state, false); + + if (!isValidDataState (data_state)) return false; + + char *query = "UPDATE detNormalizedStatImfile SET data_state = '%s'" + " WHERE det_id = %" PRId64 + " AND iteration = %" PRId32 + " AND class_id = %s"; + if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration)) { + psError(PS_ERR_UNKNOWN, false, + "failed to change state for det_id %" PRId64 ", iteration %" PRId32, + det_id, iteration); + return false; + } + + return true; +} + +bool setNormImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(class_id, false); + PS_ASSERT_PTR_NON_NULL(data_state, false); + + if (!isValidDataState (data_state)) return false; + + char *query = "UPDATE detNormalizedImfile SET data_state = '%s'" + " WHERE det_id = %" PRId64 + " AND iteration = %" PRId32 + " AND class_id = %s"; + if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration, class_id)) { + psError(PS_ERR_UNKNOWN, false, + "failed to change state for det_id %" PRId64 ", iteration %" PRId32 " class %s", + det_id, iteration, class_id); + return false; + } + + return true; +} + +bool setNormExpDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *data_state) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(data_state, false); + + if (!isValidDataState (data_state)) return false; + + char *query = "UPDATE detNormalizedExp SET data_state = '%s'" + " WHERE det_id = %" PRId64 + " AND iteration = %" PRId32; + if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration)) { + psError(PS_ERR_UNKNOWN, false, + "failed to change state for det_id %" PRId64 ", iteration %" PRId32, + det_id, iteration); + return false; + } + + return true; +} + +bool setResidImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, psS64 exp_id, const char *class_id, const char *data_state) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(data_state, false); + PS_ASSERT_PTR_NON_NULL(class_id, false); + + if (!isValidDataState (data_state)) return false; + + char *query = "UPDATE detResidImfile SET data_state = '%s'" + " WHERE det_id = %" PRId64 + " AND iteration = %" PRId32 + " AND exp_id = %" PRId64 + " AND class_id = '%s'"; + if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration, exp_id, class_id)) { + psError(PS_ERR_UNKNOWN, false, + "failed to change state for det_id %" PRId64 ", iteration %" PRId32 ", exp_id %" PRId64 ", class_id %s", + det_id, iteration, exp_id, class_id); + return false; + } + + return true; +} + +bool setResidExpDataState(pxConfig *config, psS64 det_id, psS32 iteration, psS64 exp_id, const char *data_state) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(data_state, false); + + if (!isValidDataState (data_state)) return false; + + char *query = "UPDATE detResidExp SET data_state = '%s'" + " WHERE det_id = %" PRId64 + " AND iteration = %" PRId32 + " AND exp_id = %" PRId64; + if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration, exp_id)) { + psError(PS_ERR_UNKNOWN, false, + "failed to change state for det_id %" PRId64 ", iteration %" PRId32 ", exp_id %" PRId64, + det_id, iteration, exp_id); + return false; + } + + return true; +} #if 0 Index: /branches/eam_branch_20080719/ippTools/src/dettool.h =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool.h (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool.h (revision 18991) @@ -46,4 +46,5 @@ DETTOOL_MODE_PROCESSEDIMFILE, DETTOOL_MODE_REVERTPROCESSEDIMFILE, + DETTOOL_MODE_UPDATEPROCESSEDIMFILE, DETTOOL_MODE_PENDINGCLEANUP_PROCESSEDIMFILE, DETTOOL_MODE_DONECLEANUP_PROCESSEDIMFILE, @@ -53,4 +54,5 @@ DETTOOL_MODE_PROCESSEDEXP, DETTOOL_MODE_REVERTPROCESSEDEXP, + DETTOOL_MODE_UPDATEPROCESSEDEXP, DETTOOL_MODE_PENDINGCLEANUP_PROCESSEDEXP, DETTOOL_MODE_DONECLEANUP_PROCESSEDEXP, @@ -60,4 +62,5 @@ DETTOOL_MODE_STACKED, DETTOOL_MODE_REVERTSTACKED, + DETTOOL_MODE_UPDATESTACKED, DETTOOL_MODE_PENDINGCLEANUP_STACKED, DETTOOL_MODE_DONECLEANUP_STACKED, @@ -67,4 +70,5 @@ DETTOOL_MODE_NORMALIZEDSTAT, DETTOOL_MODE_REVERTNORMALIZEDSTAT, + DETTOOL_MODE_UPDATENORMALIZEDSTAT, DETTOOL_MODE_PENDINGCLEANUP_NORMALIZEDSTAT, DETTOOL_MODE_DONECLEANUP_NORMALIZEDSTAT, @@ -74,4 +78,5 @@ DETTOOL_MODE_NORMALIZEDIMFILE, DETTOOL_MODE_REVERTNORMALIZEDIMFILE, + DETTOOL_MODE_UPDATENORMALIZEDIMFILE, DETTOOL_MODE_PENDINGCLEANUP_NORMALIZEDIMFILE, DETTOOL_MODE_DONECLEANUP_NORMALIZEDIMFILE, @@ -81,4 +86,5 @@ DETTOOL_MODE_NORMALIZEDEXP, DETTOOL_MODE_REVERTNORMALIZEDEXP, + DETTOOL_MODE_UPDATENORMALIZEDEXP, DETTOOL_MODE_PENDINGCLEANUP_NORMALIZEDEXP, DETTOOL_MODE_DONECLEANUP_NORMALIZEDEXP, @@ -88,4 +94,5 @@ DETTOOL_MODE_RESIDIMFILE, DETTOOL_MODE_REVERTRESIDIMFILE, + DETTOOL_MODE_UPDATERESIDIMFILE, DETTOOL_MODE_PENDINGCLEANUP_RESIDIMFILE, DETTOOL_MODE_DONECLEANUP_RESIDIMFILE, @@ -95,4 +102,5 @@ DETTOOL_MODE_RESIDEXP, DETTOOL_MODE_REVERTRESIDEXP, + DETTOOL_MODE_UPDATERESIDEXP, DETTOOL_MODE_PENDINGCLEANUP_RESIDEXP, DETTOOL_MODE_DONECLEANUP_RESIDEXP, @@ -102,5 +110,4 @@ DETTOOL_MODE_DETRUNSUMMARY, DETTOOL_MODE_REVERTDETRUNSUMMARY, - DETTOOL_MODE_UPDATERESIDEXP, DETTOOL_MODE_UPDATEDETRUNSUMMARY, DETTOOL_MODE_UPDATEDETRUN, @@ -126,4 +133,5 @@ bool processedimfileMode(pxConfig *config); bool revertprocessedimfileMode(pxConfig *config); +bool updateprocessedimfileMode(pxConfig *config); bool pendingcleanup_processedimfileMode(pxConfig *config); bool donecleanup_processedimfileMode(pxConfig *config); @@ -134,4 +142,5 @@ bool processedexpMode(pxConfig *config); bool revertprocessedexpMode(pxConfig *config); +bool updateprocessedexpMode(pxConfig *config); bool pendingcleanup_processedexpMode(pxConfig *config); bool donecleanup_processedexpMode(pxConfig *config); @@ -142,4 +151,5 @@ bool stackedMode(pxConfig *config); bool revertstackedMode(pxConfig *config); +bool updatestackedMode(pxConfig *config); bool pendingcleanup_stackedMode(pxConfig *config); bool donecleanup_stackedMode(pxConfig *config); @@ -150,4 +160,5 @@ bool normalizedstatMode(pxConfig *config); bool revertnormalizedstatMode(pxConfig *config); +bool updatenormalizedstatMode(pxConfig *config); bool pendingcleanup_normalizedstatMode(pxConfig *config); bool donecleanup_normalizedstatMode(pxConfig *config); @@ -158,4 +169,5 @@ bool normalizedimfileMode(pxConfig *config); bool revertnormalizedimfileMode(pxConfig *config); +bool updatenormalizedimfileMode(pxConfig *config); bool pendingcleanup_normalizedimfileMode(pxConfig *config); bool donecleanup_normalizedimfileMode(pxConfig *config); @@ -166,4 +178,5 @@ bool normalizedexpMode(pxConfig *config); bool revertnormalizedexpMode(pxConfig *config); +bool updatenormalizedexpMode(pxConfig *config); bool pendingcleanup_normalizedexpMode(pxConfig *config); bool donecleanup_normalizedexpMode(pxConfig *config); @@ -174,4 +187,5 @@ bool residimfileMode(pxConfig *config); bool revertresidimfileMode(pxConfig *config); +bool updateresidimfileMode(pxConfig *config); bool pendingcleanup_residimfileMode(pxConfig *config); bool donecleanup_residimfileMode(pxConfig *config); @@ -196,4 +210,16 @@ bool startNewIteration(pxConfig *config, psS64 det_id); bool setDetRunState(pxConfig *config, psS64 det_id, const char *state); +bool isValidDataState (const char *data_state); +bool isValidMode(pxConfig *config, const char *mode); + +// functions to set the 'data_state' for stages +bool setProcessedImfileDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *class_id, const char *data_state); +bool setProcessedExpDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *data_state); +bool setStackedImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *data_state); +bool setNormStatImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state); +bool setNormImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state); +bool setNormExpDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *data_state); +bool setResidImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, psS64 exp_id, const char *class_id, const char *data_state); +bool setResidExpDataState(pxConfig *config, psS64 det_id, psS32 iteration, psS64 exp_id, const char *data_state); #endif // DETTOOL_H Index: /branches/eam_branch_20080719/ippTools/src/dettoolConfig.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettoolConfig.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettoolConfig.c (revision 18991) @@ -41,5 +41,5 @@ // XXX EAM : is this used? does it make sense? psMetadata *pendingArgs = psMetadataAlloc(); - psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddS64(pendingArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0); psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exposure type", NULL); psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-inst", 0, "search by camera", NULL); @@ -51,5 +51,5 @@ // -definebytag psMetadata *definebytagArgs = psMetadataAlloc(); - psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-exp_id", PS_META_DUPLICATE_OK, "include this exposure (multiple OK, required)", NULL); + psMetadataAddS64(definebytagArgs, PS_LIST_TAIL, "-exp_id", PS_META_DUPLICATE_OK, "include this exposure (multiple OK, required)", 0); psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-det_type", 0, "define the type of detrend run (required)", NULL); psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-mode", 0, "define the mode of this detrend run", "master"); @@ -132,5 +132,5 @@ // -definebydetrun psMetadata *definebydetrunArgs = psMetadataAlloc(); - psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-det_id", 0, "det ID to base a new detRun on (required)", NULL); + psMetadataAddS64(definebydetrunArgs, PS_LIST_TAIL, "-det_id", 0, "det ID to base a new detRun on (required)", 0); psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_det_type", 0, "define the type of detrend run", NULL); psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_mode", 0, "define the mode of this detrend run", "master"); @@ -163,5 +163,5 @@ // -makecorrection psMetadata *makecorrectionArgs = psMetadataAlloc(); - psMetadataAddStr(makecorrectionArgs, PS_LIST_TAIL, "-det_id", 0, "det ID to be corrected (required)", NULL); + psMetadataAddS64(makecorrectionArgs, PS_LIST_TAIL, "-det_id", 0, "det ID to be corrected (required)", 0); psMetadataAddBool(makecorrectionArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -173,5 +173,5 @@ // -tocorrectimfile psMetadata *tocorrectimfileArgs = psMetadataAlloc(); - psMetadataAddStr(tocorrectimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS64(tocorrectimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); psMetadataAddU64(tocorrectimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(tocorrectimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -179,5 +179,5 @@ // -addcorrectimfile psMetadata *addcorrectimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(addcorrectimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID (required)", NULL); psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-uri", 0, "define resid file URI", NULL); @@ -195,5 +195,5 @@ psMetadata *runsArgs = psMetadataAlloc(); psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-det_type", 0, "search for type of detrend run", NULL); - psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS64(runsArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-inst", 0, "search for camera (instrument)", NULL); psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); @@ -215,5 +215,5 @@ // -input psMetadata *inputArgs = psMetadataAlloc(); - psMetadataAddStr(inputArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS64(inputArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); psMetadataAddS32(inputArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); psMetadataAddS64(inputArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", 0); @@ -226,6 +226,6 @@ // -toprocessedimfile psMetadata *toprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(toprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); - psMetadataAddStr(toprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", NULL); + psMetadataAddS64(toprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); + psMetadataAddS64(toprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", 0); psMetadataAddStr(toprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); psMetadataAddU64(toprocessedimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); @@ -234,6 +234,6 @@ // -addprocessedimfile psMetadata *addprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); - psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define exp ID (required)", NULL); + psMetadataAddS64(addprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); + psMetadataAddS64(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define exp ID (required)", 0); psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); @@ -255,6 +255,6 @@ // -processedimfile psMetadata *processedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); - psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", NULL); + psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); + psMetadataAddS64(processedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", 0); psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-select_state", 0, "search for state", NULL); @@ -265,4 +265,11 @@ psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + // -updateprocessedimfile + psMetadata *updateprocessedimfileArgs = psMetadataAlloc(); + psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search by chip ID", 0); + psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by exp_name", NULL); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-data_state", 0, "search for telescope", NULL); + // -pendingcleanup_processedimfile psMetadata *pendingcleanup_processedimfileArgs = psMetadataAlloc(); @@ -271,16 +278,12 @@ // -donecleanup_processedimfile - psMetadata *donecleanupArgs = psMetadataAlloc(); - psMetadataAddBool(donecleanupArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadataAddU64(donecleanupArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - - // XXX these don't seem to be used anymore - // psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-chip", 0, "restrict results to completed 'chip' sets", false); - // psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-exp", 0, "restrict results to complete 'exposures'", false); + psMetadata *donecleanup_processedimfileArgs = psMetadataAlloc(); + psMetadataAddBool(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -revertprocessedimfile psMetadata *revertprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID (required)", NULL); - psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID (required)", 0); + psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0); psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); @@ -293,6 +296,6 @@ // -addproccessedexp psMetadata *addprocessedexpArgs = psMetadataAlloc(); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); + psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "define detrend ID (required)", 0); psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-recip", 0, "define recipe", NULL); psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); @@ -312,6 +315,6 @@ // -proccessedexp psMetadata *processedexpArgs = psMetadataAlloc(); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID", NULL); - psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp ID", NULL); + psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID", 0); + psMetadataAddS64(processedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp ID", 0); psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); @@ -320,7 +323,24 @@ // -revertprocessedexp psMetadata *revertprocessedexpArgs = psMetadataAlloc(); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); - psMetadataAddStr(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); + psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", 0); + psMetadataAddS64(revertprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0); psMetadataAddS16(revertprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); + + // -updateprocessedexp + psMetadata *updateprocessedexpArgs = psMetadataAlloc(); + psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by chip ID", 0); + psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(updateprocessedexpArgs, PS_LIST_TAIL, "-class_id", 0, "search by exp_name", NULL); + psMetadataAddStr(updateprocessedexpArgs, PS_LIST_TAIL, "-data_state", 0, "search for telescope", NULL); + + // -pendingcleanup_processedexp + psMetadata *pendingcleanup_processedexpArgs = psMetadataAlloc(); + psMetadataAddBool(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + + // -donecleanup_processedexp + psMetadata *donecleanup_processedexpArgs = psMetadataAlloc(); + psMetadataAddBool(donecleanup_processedexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(donecleanup_processedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -tostacked @@ -331,5 +351,5 @@ // -addstacked psMetadata *addstackedArgs = psMetadataAlloc(); - psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(addstackedArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); psMetadataAddS32(addstackedArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number (required)", 0); psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); @@ -348,5 +368,5 @@ // -stacked psMetadata *stackedArgs = psMetadataAlloc(); - psMetadataAddStr(stackedArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS64(stackedArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); psMetadataAddS32(stackedArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); psMetadataAddStr(stackedArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); @@ -358,8 +378,25 @@ // -revertstacked psMetadata *revertstackedArgs= psMetadataAlloc(); - psMetadataAddStr(revertstackedArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID (required)", NULL); + psMetadataAddS64(revertstackedArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID (required)", 0); psMetadataAddS32(revertstackedArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); psMetadataAddStr(revertstackedArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); psMetadataAddS16(revertstackedArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); + + // -updatestacked + psMetadata *updatestackedArgs = psMetadataAlloc(); + psMetadataAddS64(updatestackedArgs, PS_LIST_TAIL, "-det_id", 0, "search by chip ID", 0); + psMetadataAddS64(updatestackedArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(updatestackedArgs, PS_LIST_TAIL, "-class_id", 0, "search by exp_name", NULL); + psMetadataAddStr(updatestackedArgs, PS_LIST_TAIL, "-data_state", 0, "search for telescope", NULL); + + // -pendingcleanup_stacked + psMetadata *pendingcleanup_stackedArgs = psMetadataAlloc(); + psMetadataAddBool(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + + // -donecleanup_stacked + psMetadata *donecleanup_stackedArgs = psMetadataAlloc(); + psMetadataAddBool(donecleanup_stackedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(donecleanup_stackedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -tonormalizedstat @@ -370,5 +407,5 @@ // -addnormalizedstat psMetadata *addnormstatArgs = psMetadataAlloc(); - psMetadataAddStr(addnormstatArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(addnormstatArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); psMetadataAddS32(addnormstatArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); psMetadataAddStr(addnormstatArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); @@ -378,5 +415,5 @@ // -normalizedstat psMetadata *normalizedstatArgs = psMetadataAlloc(); - psMetadataAddStr(normalizedstatArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID", NULL); + psMetadataAddS64(normalizedstatArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID", 0); psMetadataAddS32(normalizedstatArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); psMetadataAddStr(normalizedstatArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); @@ -387,8 +424,25 @@ // -revertnormalizedstat psMetadata *revertnormalizedstatArgs= psMetadataAlloc(); - psMetadataAddStr(revertnormalizedstatArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS64(revertnormalizedstatArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", 0); psMetadataAddS32(revertnormalizedstatArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); psMetadataAddStr(revertnormalizedstatArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); psMetadataAddS16(revertnormalizedstatArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); + + // -updatenormalizedstat + psMetadata *updatenormalizedstatArgs = psMetadataAlloc(); + psMetadataAddS64(updatenormalizedstatArgs, PS_LIST_TAIL, "-det_id", 0, "search by chip ID", 0); + psMetadataAddS64(updatenormalizedstatArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(updatenormalizedstatArgs, PS_LIST_TAIL, "-class_id", 0, "search by exp_name", NULL); + psMetadataAddStr(updatenormalizedstatArgs, PS_LIST_TAIL, "-data_state", 0, "search for telescope", NULL); + + // -pendingcleanup_normalizedstat + psMetadata *pendingcleanup_normalizedstatArgs = psMetadataAlloc(); + psMetadataAddBool(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + + // -donecleanup_normalizedstat + psMetadata *donecleanup_normalizedstatArgs = psMetadataAlloc(); + psMetadataAddBool(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -tonormalize @@ -399,5 +453,5 @@ // -addnormalizedimfile psMetadata *addnormalizedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(addnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); psMetadataAddS32(addnormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); @@ -416,5 +470,5 @@ // -normalizedimfile psMetadata *normalizedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS64(normalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); psMetadataAddS32(normalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); psMetadataAddStr(normalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); @@ -426,8 +480,25 @@ // -revertnormalizedimfile psMetadata *revertnormalizedimfileArgs = psMetadataAlloc(); - psMetadataAddStr(revertnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS64(revertnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", 0); psMetadataAddS32(revertnormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); psMetadataAddStr(revertnormalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by class ID", NULL); psMetadataAddS16(revertnormalizedimfileArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); + + // -updatenormalizedimfile + psMetadata *updatenormalizedimfileArgs = psMetadataAlloc(); + psMetadataAddS64(updatenormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search by chip ID", 0); + psMetadataAddS64(updatenormalizedimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(updatenormalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by exp_name", NULL); + psMetadataAddStr(updatenormalizedimfileArgs, PS_LIST_TAIL, "-data_state", 0, "search for telescope", NULL); + + // -pendingcleanup_normalizedimfile + psMetadata *pendingcleanup_normalizedimfileArgs = psMetadataAlloc(); + psMetadataAddBool(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + + // -donecleanup_normalizedimfile + psMetadata *donecleanup_normalizedimfileArgs = psMetadataAlloc(); + psMetadataAddBool(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -tonormalizedexp @@ -438,5 +509,5 @@ // -addnormalizedexp psMetadata *addnormalizedexpArgs = psMetadataAlloc(); - psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(addnormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); psMetadataAddS32(addnormalizedexpArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); psMetadataAddS16(addnormalizedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); @@ -454,5 +525,5 @@ // -normalizedexp psMetadata *normalizedexpArgs = psMetadataAlloc(); - psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID", NULL); + psMetadataAddS64(normalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID", 0); psMetadataAddS32(normalizedexpArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); psMetadataAddStr(normalizedexpArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); @@ -463,7 +534,24 @@ // -revertnormalizedexp psMetadata *revertnormalizedexpArgs = psMetadataAlloc(); - psMetadataAddStr(revertnormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS64(revertnormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", 0); psMetadataAddS32(revertnormalizedexpArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); psMetadataAddS16(revertnormalizedexpArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); + + // -updatenormalizedexp + psMetadata *updatenormalizedexpArgs = psMetadataAlloc(); + psMetadataAddS64(updatenormalizedexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by chip ID", 0); + psMetadataAddS64(updatenormalizedexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(updatenormalizedexpArgs, PS_LIST_TAIL, "-class_id", 0, "search by exp_name", NULL); + psMetadataAddStr(updatenormalizedexpArgs, PS_LIST_TAIL, "-data_state", 0, "search for telescope", NULL); + + // -pendingcleanup_normalizedexp + psMetadata *pendingcleanup_normalizedexpArgs = psMetadataAlloc(); + psMetadataAddBool(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + + // -donecleanup_normalizedexp + psMetadata *donecleanup_normalizedexpArgs = psMetadataAlloc(); + psMetadataAddBool(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -toresidimfile @@ -474,7 +562,7 @@ // -addresidimfile psMetadata *addresidimfileArgs = psMetadataAlloc(); - psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(addresidimfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); psMetadataAddS32(addresidimfileArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); - psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(addresidimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define detrend ID (required)", 0); psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID (required)", NULL); psMetadataAddS16(addresidimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); @@ -502,7 +590,7 @@ // -residimfile psMetadata *residimfileArgs = psMetadataAlloc(); - psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS64(residimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); psMetadataAddS32(residimfileArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); - psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by detrend ID", NULL); + psMetadataAddS64(residimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by detrend ID", 0); psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); @@ -514,9 +602,26 @@ // -revertresidimfile psMetadata *revertresidimfileArgs = psMetadataAlloc(); - psMetadataAddStr(revertresidimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS64(revertresidimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", 0); psMetadataAddS32(revertresidimfileArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); - psMetadataAddStr(revertresidimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by detrend ID", NULL); + psMetadataAddS64(revertresidimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by detrend ID", 0); psMetadataAddStr(revertresidimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID", NULL); psMetadataAddS16(revertresidimfileArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); + + // -updateresidimfile + psMetadata *updateresidimfileArgs = psMetadataAlloc(); + psMetadataAddS64(updateresidimfileArgs, PS_LIST_TAIL, "-det_id", 0, "search by chip ID", 0); + psMetadataAddS64(updateresidimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(updateresidimfileArgs, PS_LIST_TAIL, "-class_id", 0, "search by exp_name", NULL); + psMetadataAddStr(updateresidimfileArgs, PS_LIST_TAIL, "-data_state", 0, "search for telescope", NULL); + + // -pendingcleanup_residimfile + psMetadata *pendingcleanup_residimfileArgs = psMetadataAlloc(); + psMetadataAddBool(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + + // -donecleanup_residimfile + psMetadata *donecleanup_residimfileArgs = psMetadataAlloc(); + psMetadataAddBool(donecleanup_residimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(donecleanup_residimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -toresidexp @@ -527,7 +632,7 @@ // -addresidexp psMetadata *addresidexpArgs = psMetadataAlloc(); - psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(addresidexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); psMetadataAddS32(addresidexpArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); - psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(addresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, "define detrend ID (required)", 0); psMetadataAddS16(addresidexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-recip", 0, "define recipe", NULL); @@ -554,7 +659,7 @@ // -residexp psMetadata *residexpArgs = psMetadataAlloc(); - psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS64(residexpArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); psMetadataAddS32(residexpArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); - psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", NULL); + psMetadataAddS64(residexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search for exp ID", 0); psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-recip", 0, "search for recipe", NULL); psMetadataAddBool(residexpArgs, PS_LIST_TAIL, "-reject", 0, "search for acceptable residuals", false); @@ -565,14 +670,14 @@ // -revertresidexp psMetadata *revertresidexpArgs = psMetadataAlloc(); - psMetadataAddStr(revertresidexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS64(revertresidexpArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", 0); psMetadataAddS32(revertresidexpArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); - psMetadataAddStr(revertresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by detrend ID", NULL); + psMetadataAddS64(revertresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by detrend ID", 0); psMetadataAddS16(revertresidexpArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -updateresidexp psMetadata *updateresidexpArgs = psMetadataAlloc(); - psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID", NULL); + psMetadataAddS64(updateresidexpArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID", 0); psMetadataAddS32(updateresidexpArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); - psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, "define exp ID", NULL); + psMetadataAddS64(updateresidexpArgs, PS_LIST_TAIL, "-exp_id", 0, "define exp ID", 0); psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-recip", 0, "define recipe", NULL); psMetadataAddF64(updateresidexpArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); @@ -582,4 +687,14 @@ psMetadataAddBool(updateresidexpArgs, PS_LIST_TAIL, "-reject", 0, "exposure is not to be stacked in the next iteration", false); + // -pendingcleanup_residexp + psMetadata *pendingcleanup_residexpArgs = psMetadataAlloc(); + psMetadataAddBool(pendingcleanup_residexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(pendingcleanup_residexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + + // -donecleanup_residexp + psMetadata *donecleanup_residexpArgs = psMetadataAlloc(); + psMetadataAddBool(donecleanup_residexpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(donecleanup_residexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + // -todetrunsummary psMetadata *todetrunsummaryArgs = psMetadataAlloc(); @@ -589,5 +704,5 @@ // -adddetrunsummary psMetadata *adddetrunsummaryArgs = psMetadataAlloc(); - psMetadataAddStr(adddetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(adddetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); psMetadataAddS32(adddetrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0, "define iteration number", 0); psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); @@ -600,5 +715,5 @@ // -detrunsummary psMetadata *detrunsummaryArgs = psMetadataAlloc(); - psMetadataAddStr(detrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", NULL); + psMetadataAddS64(detrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend ID", 0); psMetadataAddS32(detrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0, "search for iteration number", 0); psMetadataAddU64(detrunsummaryArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); @@ -609,5 +724,5 @@ // -revertdetrunsummary psMetadata *revertdetrunsummaryArgs = psMetadataAlloc(); - psMetadataAddStr(revertdetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", NULL); + psMetadataAddS64(revertdetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "search by detrend ID (required)", 0); psMetadataAddS32(revertdetrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0, "search by iteration number", 0); psMetadataAddS16(revertdetrunsummaryArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); @@ -615,5 +730,5 @@ // -updatedetrunsummary psMetadata *updatedetrunsummaryArgs = psMetadataAlloc(); - psMetadataAddStr(updatedetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend master for detrend ID (required)", NULL); + psMetadataAddS64(updatedetrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend master for detrend ID (required)", 0); psMetadataAddBool(updatedetrunsummaryArgs, PS_LIST_TAIL, "-accept", 0, "declare that this detrun iteration is accepted as a master", false); psMetadataAddBool(updatedetrunsummaryArgs, PS_LIST_TAIL, "-reject", 0, "reject this detrun iteration as a master", false); @@ -621,5 +736,5 @@ // -updatedetrun psMetadata *updatedetrunArgs = psMetadataAlloc(); - psMetadataAddStr(updatedetrunArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend master for detrend ID (required)", NULL); + psMetadataAddS64(updatedetrunArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend master for detrend ID (required)", 0); psMetadataAddBool(updatedetrunArgs, PS_LIST_TAIL, "-again", 0, "start a new iteration of this detrend run", false); psMetadataAddStr(updatedetrunArgs, PS_LIST_TAIL, "-state", 0, "set the state of this detrend run", false); @@ -627,6 +742,6 @@ // -rerun psMetadata *rerunArgs = psMetadataAlloc(); - psMetadataAddStr(rerunArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend master for detrend ID (required)", NULL); - psMetadataAddStr(rerunArgs, PS_LIST_TAIL, "-exp_id", PS_META_DUPLICATE_OK, "include this exposure (multiple OK, required)", NULL); + psMetadataAddS64(rerunArgs, PS_LIST_TAIL, "-det_id", 0, "search for detrend master for detrend ID (required)", 0); + psMetadataAddS64(rerunArgs, PS_LIST_TAIL, "-exp_id", PS_META_DUPLICATE_OK, "include this exposure (multiple OK, required)", 0); // -register_detrend @@ -654,5 +769,5 @@ psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-use_begin", 0, "start of detrend run applicable period", NULL); psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-use_end", 0, "end of detrend run applicable period", NULL); - psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-parent", 0, "define parent det_id", NULL); + psMetadataAddS64(register_detrendArgs, PS_LIST_TAIL, "-parent", 0, "define parent det_id", 0); psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-label", 0, "define detrun label", NULL); psMetadataAddBool(register_detrendArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -660,5 +775,5 @@ // -register_detrend_imfile psMetadata *register_detrend_imfileArgs = psMetadataAlloc(); - psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", NULL); + psMetadataAddS64(register_detrend_imfileArgs, PS_LIST_TAIL, "-det_id", 0, "define detrend ID (required)", 0); psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-class_id", 0, "search for class ID (required)", NULL); psMetadataAddStr(register_detrend_imfileArgs, PS_LIST_TAIL, "-uri", 0, "define resid file URI (required)", NULL); @@ -690,37 +805,69 @@ PXOPT_ADD_MODE("-childlessrun", "", DETTOOL_MODE_CHILDLESSRUN, childlessrunArgs); PXOPT_ADD_MODE("-input", "", DETTOOL_MODE_INPUT, inputArgs); - PXOPT_ADD_MODE("-toprocessedimfile", "", DETTOOL_MODE_TOPROCESSEDIMFILE, toprocessedimfileArgs); - PXOPT_ADD_MODE("-addprocessedimfile", "", DETTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs); - PXOPT_ADD_MODE("-processedimfile", "", DETTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); - PXOPT_ADD_MODE("-revertprocessedimfile", "", DETTOOL_MODE_REVERTPROCESSEDIMFILE, revertprocessedimfileArgs); + + PXOPT_ADD_MODE("-toprocessedimfile", "", DETTOOL_MODE_TOPROCESSEDIMFILE, toprocessedimfileArgs); + PXOPT_ADD_MODE("-addprocessedimfile", "", DETTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs); + PXOPT_ADD_MODE("-processedimfile", "", DETTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); + PXOPT_ADD_MODE("-revertprocessedimfile", "", DETTOOL_MODE_REVERTPROCESSEDIMFILE, revertprocessedimfileArgs); + PXOPT_ADD_MODE("-updateprocessedimfile", "", DETTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); + PXOPT_ADD_MODE("-pendingcleanup_processedimfile", "", DETTOOL_MODE_PENDINGCLEANUP_PROCESSEDIMFILE, pendingcleanup_processedimfileArgs); + PXOPT_ADD_MODE("-donecleanup_processedimfile", "", DETTOOL_MODE_DONECLEANUP_PROCESSEDIMFILE, donecleanup_processedimfileArgs); + PXOPT_ADD_MODE("-toprocessedexp", "", DETTOOL_MODE_TOPROCESSEDEXP, toprocessedexpArgs); PXOPT_ADD_MODE("-addprocessedexp", "", DETTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs); + PXOPT_ADD_MODE("-processedexp", "", DETTOOL_MODE_PROCESSEDEXP, processedexpArgs); PXOPT_ADD_MODE("-revertprocessedexp", "", DETTOOL_MODE_REVERTPROCESSEDEXP, revertprocessedexpArgs); - PXOPT_ADD_MODE("-processedexp", "", DETTOOL_MODE_PROCESSEDEXP, processedexpArgs); + PXOPT_ADD_MODE("-updateprocessedexp", "", DETTOOL_MODE_UPDATEPROCESSEDEXP, updateprocessedexpArgs); + PXOPT_ADD_MODE("-pendingcleanup_processedexp", "", DETTOOL_MODE_PENDINGCLEANUP_PROCESSEDEXP, pendingcleanup_processedexpArgs); + PXOPT_ADD_MODE("-donecleanup_processedexp", "", DETTOOL_MODE_DONECLEANUP_PROCESSEDEXP, donecleanup_processedexpArgs); + PXOPT_ADD_MODE("-tostacked", "", DETTOOL_MODE_TOSTACKED, tostackedArgs); PXOPT_ADD_MODE("-addstacked", "", DETTOOL_MODE_ADDSTACKED, addstackedArgs); PXOPT_ADD_MODE("-stacked", "", DETTOOL_MODE_STACKED, stackedArgs); PXOPT_ADD_MODE("-revertstacked", "", DETTOOL_MODE_REVERTSTACKED, revertstackedArgs); + PXOPT_ADD_MODE("-updatestacked", "", DETTOOL_MODE_UPDATESTACKED, updatestackedArgs); + PXOPT_ADD_MODE("-pendingcleanup_stacked", "", DETTOOL_MODE_PENDINGCLEANUP_STACKED, pendingcleanup_stackedArgs); + PXOPT_ADD_MODE("-donecleanup_stacked", "", DETTOOL_MODE_DONECLEANUP_STACKED, donecleanup_stackedArgs); + + PXOPT_ADD_MODE("-tonormalizedstat", "", DETTOOL_MODE_TONORMALIZEDSTAT, tonormalizedstatArgs); + PXOPT_ADD_MODE("-addnormalizedstat", "", DETTOOL_MODE_ADDNORMALIZEDSTAT, addnormstatArgs); + PXOPT_ADD_MODE("-normalizedstat", "", DETTOOL_MODE_NORMALIZEDSTAT, normalizedstatArgs); + PXOPT_ADD_MODE("-revertnormalizedstat", "", DETTOOL_MODE_REVERTNORMALIZEDSTAT, revertnormalizedstatArgs); + PXOPT_ADD_MODE("-updatenormalizedstat", "", DETTOOL_MODE_REVERTNORMALIZEDSTAT, revertnormalizedstatArgs); + PXOPT_ADD_MODE("-pendingcleanup_normalizedstat", "", DETTOOL_MODE_PENDINGCLEANUP_NORMALIZEDSTAT, pendingcleanup_normalizedstatArgs); + PXOPT_ADD_MODE("-donecleanup_normalizedstat", "", DETTOOL_MODE_DONECLEANUP_NORMALIZEDSTAT, donecleanup_normalizedstatArgs); + PXOPT_ADD_MODE("-tonormalize", "", DETTOOL_MODE_TONORMALIZE, tonormalizeArgs); - PXOPT_ADD_MODE("-addnormalizedstat", "", DETTOOL_MODE_ADDNORMALIZEDSTAT, addnormstatArgs); - PXOPT_ADD_MODE("-normalizedstat", "", DETTOOL_MODE_NORMALIZEDSTAT, normalizedstatArgs); - PXOPT_ADD_MODE("-revertnormalizedstat", "", DETTOOL_MODE_REVERTNORMALIZEDSTAT, revertnormalizedstatArgs); - - PXOPT_ADD_MODE("-tonormalizedstat", "", DETTOOL_MODE_TONORMALIZEDSTAT, tonormalizedstatArgs); PXOPT_ADD_MODE("-addnormalizedimfile", "", DETTOOL_MODE_ADDNORMALIZEDIMFILE,addnormalizedimfileArgs); PXOPT_ADD_MODE("-normalizedimfile","", DETTOOL_MODE_NORMALIZEDIMFILE, normalizedimfileArgs); PXOPT_ADD_MODE("-revertnormalizedimfile","", DETTOOL_MODE_REVERTNORMALIZEDIMFILE, revertnormalizedimfileArgs); + PXOPT_ADD_MODE("-updatenormalizedimfile","", DETTOOL_MODE_UPDATENORMALIZEDIMFILE, updatenormalizedimfileArgs); + PXOPT_ADD_MODE("-pendingcleanup_normalizedimfile", "", DETTOOL_MODE_PENDINGCLEANUP_NORMALIZEDIMFILE, pendingcleanup_normalizedimfileArgs); + PXOPT_ADD_MODE("-donecleanup_normalizedimfile", "", DETTOOL_MODE_DONECLEANUP_NORMALIZEDIMFILE, donecleanup_normalizedimfileArgs); + PXOPT_ADD_MODE("-tonormalizedexp", "", DETTOOL_MODE_TONORMALIZEDEXP, tonormalizedexpArgs); PXOPT_ADD_MODE("-addnormalizedexp", "", DETTOOL_MODE_ADDNORMALIZEDEXP, addnormalizedexpArgs); PXOPT_ADD_MODE("-normalizedexp", "", DETTOOL_MODE_NORMALIZEDEXP, normalizedexpArgs); PXOPT_ADD_MODE("-revertnormalizedexp","", DETTOOL_MODE_REVERTNORMALIZEDEXP, revertnormalizedexpArgs); + PXOPT_ADD_MODE("-updatenormalizedexp","", DETTOOL_MODE_UPDATENORMALIZEDEXP, updatenormalizedexpArgs); + PXOPT_ADD_MODE("-pendingcleanup_normalizedexp", "", DETTOOL_MODE_PENDINGCLEANUP_NORMALIZEDEXP, pendingcleanup_normalizedexpArgs); + PXOPT_ADD_MODE("-donecleanup_normalizedexp", "", DETTOOL_MODE_DONECLEANUP_NORMALIZEDEXP, donecleanup_normalizedexpArgs); + PXOPT_ADD_MODE("-toresidimfile", "", DETTOOL_MODE_TORESIDIMFILE, toresidimfileArgs); PXOPT_ADD_MODE("-addresidimfile", "", DETTOOL_MODE_ADDRESIDIMFILE, addresidimfileArgs); PXOPT_ADD_MODE("-residimfile", "", DETTOOL_MODE_RESIDIMFILE, residimfileArgs); PXOPT_ADD_MODE("-revertresidimfile", "", DETTOOL_MODE_REVERTRESIDIMFILE, revertresidimfileArgs); + PXOPT_ADD_MODE("-updateresidimfile", "", DETTOOL_MODE_UPDATERESIDIMFILE, updateresidimfileArgs); + PXOPT_ADD_MODE("-pendingcleanup_residimfile", "", DETTOOL_MODE_PENDINGCLEANUP_RESIDIMFILE, pendingcleanup_residimfileArgs); + PXOPT_ADD_MODE("-donecleanup_residimfile", "", DETTOOL_MODE_DONECLEANUP_RESIDIMFILE, donecleanup_residimfileArgs); + PXOPT_ADD_MODE("-toresidexp", "", DETTOOL_MODE_TORESIDEXP, toresidexpArgs); PXOPT_ADD_MODE("-addresidexp", "", DETTOOL_MODE_ADDRESIDEXP, addresidexpArgs); PXOPT_ADD_MODE("-residexp", "", DETTOOL_MODE_RESIDEXP, residexpArgs); PXOPT_ADD_MODE("-revertresidexp", "", DETTOOL_MODE_REVERTRESIDEXP, revertresidexpArgs); + PXOPT_ADD_MODE("-updateresidexp", "", DETTOOL_MODE_UPDATERESIDEXP, updateresidexpArgs); + PXOPT_ADD_MODE("-pendingcleanup_residexp", "", DETTOOL_MODE_PENDINGCLEANUP_RESIDEXP, pendingcleanup_residexpArgs); + PXOPT_ADD_MODE("-donecleanup_residexp", "", DETTOOL_MODE_DONECLEANUP_RESIDEXP, donecleanup_residexpArgs); + PXOPT_ADD_MODE("-todetrunsummary", "", DETTOOL_MODE_TODETRUNSUMMARY, todetrunsummaryArgs); PXOPT_ADD_MODE("-updateresidexp", "", DETTOOL_MODE_UPDATERESIDEXP,updateresidexpArgs); @@ -729,4 +876,5 @@ PXOPT_ADD_MODE("-revertdetrunsummary", "", DETTOOL_MODE_REVERTDETRUNSUMMARY, revertdetrunsummaryArgs); PXOPT_ADD_MODE("-updatedetrunsummary", "", DETTOOL_MODE_UPDATEDETRUNSUMMARY, updatedetrunsummaryArgs); + PXOPT_ADD_MODE("-updatedetrun", "", DETTOOL_MODE_UPDATEDETRUN, updatedetrunArgs); PXOPT_ADD_MODE("-rerun", "", DETTOOL_MODE_RERUN, rerunArgs); Index: /branches/eam_branch_20080719/ippTools/src/dettool_correction.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool_correction.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool_correction.c (revision 18991) @@ -24,10 +24,10 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); // optional // build the needed where psMetadata *where = psMetadataAlloc(); - psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", (psS64)atoll(det_id)); + psMetadataAddS64(where, PS_LIST_TAIL, "det_id", 0, "==", det_id); psArray *runs = detRunSelectRowObjects(config->dbh, where, 1); psFree (where); Index: /branches/eam_branch_20080719/ippTools/src/dettool_detrunsummary.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool_detrunsummary.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool_detrunsummary.c (revision 18991) @@ -94,4 +94,9 @@ return false; } + psString data_state = psMetadataLookupStr(&status, row, "data_state"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for iteration"); + return false; + } // optional @@ -107,4 +112,5 @@ det_id, iteration, + data_state, bg, bg_stdev, @@ -115,4 +121,5 @@ } +// XXX data_state should be set to 'full' here bool adddetrunsummaryMode(pxConfig *config) { @@ -121,8 +128,8 @@ // build a query to search by det_id, iteration, exp_id psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required PXOPT_LOOKUP_BOOL(again, config->args, "-again", false); @@ -200,5 +207,5 @@ // XXX it should be an error for -again and -code to both be set if (again) { - if (!startNewIteration(config, (psS64)atoll(det_id))) { + if (!startNewIteration(config, det_id)) { if (!psDBRollback(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -209,5 +216,5 @@ } else { // set detRun.state to stop - if (!setDetRunState(config, (psS64)atoll(det_id), "stop")) { + if (!setDetRunState(config, det_id, "stop")) { if (!psDBRollback(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -230,5 +237,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); @@ -302,5 +309,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); PXOPT_COPY_STR(config->args, where, "-code", "fault", "=="); @@ -334,10 +341,10 @@ } - +// XXX need to add -data_state here bool updatedetrunsummaryMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required PXOPT_LOOKUP_BOOL(accept, config->args, "-accept", false); PXOPT_LOOKUP_BOOL(reject, config->args, "-reject", false); @@ -354,11 +361,11 @@ char *query = "UPDATE detRunSummary SET accept = %d WHERE det_id = %"PRId64; - if (!p_psDBRunQuery(config->dbh, query, accept, (psS64)atoll(det_id))) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - return true; -} - - + if (!p_psDBRunQuery(config->dbh, query, accept, det_id)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + return true; +} + + Index: /branches/eam_branch_20080719/ippTools/src/dettool_normalizedexp.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool_normalizedexp.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool_normalizedexp.c (revision 18991) @@ -73,5 +73,5 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false); PXOPT_LOOKUP_S16(code, config->args, "-code", false, false); @@ -94,5 +94,5 @@ // XXX in some other places, we put the arguments in the .sql and supply them to RunQuery - psStringAppend(&query, " WHERE det_id = %s AND iteration = %d", det_id, iteration); + psStringAppend(&query, " WHERE det_id = %" PRId64 " AND iteration = %d", det_id, iteration); if (!p_psDBRunQuery(config->dbh, query)) { @@ -116,19 +116,21 @@ // insert the new row into the detProcessedImfile table - if (!detNormalizedExpInsert(config->dbh, - (psS64)atoll(det_id), - iteration, - recipe, - bg, - bg_stdev, - bg_mean_stdev, - user_1, - user_2, - user_3, - user_4, - user_5, - path_base, - code - )) { + if (!detNormalizedExpInsert( + config->dbh, + det_id, + iteration, + recipe, + bg, + bg_stdev, + bg_mean_stdev, + user_1, + user_2, + user_3, + user_4, + user_5, + path_base, + "full", + code + )) { psError(PS_ERR_UNKNOWN, false, "database error"); return false; @@ -144,5 +146,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); PXOPT_COPY_STR(config->args, where, "-recip", "recipe", "=="); @@ -217,5 +219,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); @@ -249,17 +251,28 @@ } +bool updatenormalizedexpMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false); + PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false); + + if (!setNormExpDataState(config, det_id, iteration, data_state)) { + return false; + } + return true; +} + bool pendingcleanup_normalizedexpMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, NULL); - PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psMetadata *where = psMetadataAlloc(); - if (chip_id) { - PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); - } - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "detNormalizedExp.det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "detNormalizedExp.iteration", "=="); psString query = pxDataGet("dettool_pendingcleanup_normalizedexp.sql"); @@ -302,5 +315,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_normalizedexp", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "detCleanupNormExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: /branches/eam_branch_20080719/ippTools/src/dettool_normalizedimfile.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool_normalizedimfile.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool_normalizedimfile.c (revision 18991) @@ -76,5 +76,5 @@ // required - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false); PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); @@ -96,20 +96,22 @@ PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); - if (!detNormalizedImfileInsert(config->dbh, - (psS64)atoll(det_id), - iteration, - class_id, - uri, - bg, - bg_stdev, - bg_mean_stdev, - user_1, - user_2, - user_3, - user_4, - user_5, - path_base, - code - )) { + if (!detNormalizedImfileInsert( + config->dbh, + det_id, + iteration, + class_id, + uri, + bg, + bg_stdev, + bg_mean_stdev, + user_1, + user_2, + user_3, + user_4, + user_5, + path_base, + "full", + code + )) { psError(PS_ERR_UNKNOWN, false, "database error"); return false; @@ -124,5 +126,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); @@ -196,5 +198,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); @@ -229,17 +231,30 @@ } +bool updatenormalizedimfileMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false); + PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); + PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false); + + if (!setNormImfileDataState(config, det_id, iteration, class_id, data_state)) { + return false; + } + return true; +} + bool pendingcleanup_normalizedimfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, NULL); - PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psMetadata *where = psMetadataAlloc(); - if (chip_id) { - PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); - } - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "detNormalizedImfile.det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "detNormalizedImfile.iteration", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "detNormalizedImfile.det_id", "=="); psString query = pxDataGet("dettool_pendingcleanup_normalizedimfile.sql"); @@ -282,5 +297,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_normalizedimfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "detCleanupNormImfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: /branches/eam_branch_20080719/ippTools/src/dettool_normalizedstat.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool_normalizedstat.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool_normalizedstat.c (revision 18991) @@ -75,5 +75,5 @@ // required - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); @@ -86,5 +86,5 @@ if (!detNormalizedStatImfileInsert(config->dbh, - (psS64)atoll(det_id), + det_id, iteration, class_id, @@ -105,5 +105,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); @@ -176,5 +176,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); @@ -209,17 +209,30 @@ } +bool updatenormalizedstatMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false); + PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); + PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false); + + if (!setNormStatImfileDataState(config, det_id, iteration, class_id, data_state)) { + return false; + } + return true; +} + bool pendingcleanup_normalizedstatMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, NULL); - PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psMetadata *where = psMetadataAlloc(); - if (chip_id) { - PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); - } - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "detNormalizedStatImfile.det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "detNormalizedStatImfile.iteration", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "detNormalizedStatImfile.det_id", "=="); psString query = pxDataGet("dettool_pendingcleanup_normalizedstat.sql"); @@ -262,5 +275,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_normalizedstat", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "detCleanupNormStatImfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: /branches/eam_branch_20080719/ippTools/src/dettool_processedexp.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool_processedexp.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool_processedexp.c (revision 18991) @@ -76,6 +76,6 @@ // det_id, exp_id, recip, -bg, -bg_stdev // are required - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); - PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false); + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false); // default values @@ -126,6 +126,6 @@ // create a new detProcessedImfile object detProcessedExpRow *detRow = detProcessedExpRowAlloc( - (psS64)atoll(det_id), - (psS64)atoll(exp_id), + det_id, + exp_id, recipe, bg, @@ -141,4 +141,5 @@ user_5, path_base, + "full", code ); @@ -161,6 +162,6 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -228,6 +229,6 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); @@ -260,17 +261,27 @@ } +bool updateprocessedexpMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false); + PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false); + if (!setProcessedExpDataState(config, det_id, exp_id, data_state)) { + return false; + } + return true; +} + bool pendingcleanup_processedexpMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, NULL); - PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psMetadata *where = psMetadataAlloc(); - if (chip_id) { - PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); - } - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "detProcessedExp.det_id", "=="); + PXOPT_COPY_STR(config->args, where, "-label", "detProcessedExp.label", "=="); psString query = pxDataGet("dettool_pendingcleanup_processedexp.sql"); @@ -313,5 +324,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_processedexp", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "detCleanupProcessedExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -324,5 +335,5 @@ } - +// XXX SQL missing bool donecleanup_processedexpMode(pxConfig *config) { @@ -374,5 +385,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "detDoneCleanup_processedexp", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "detDoneCleanupProcessedExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: /branches/eam_branch_20080719/ippTools/src/dettool_processedimfile.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool_processedimfile.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool_processedimfile.c (revision 18991) @@ -25,6 +25,6 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); @@ -87,6 +87,6 @@ // det_id, exp_id, class_id, uri, recipe, -bg, -bg_stdev are required - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); - PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false); + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false); PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); @@ -114,5 +114,5 @@ // find the matching rawImfile by exp_id/class_id psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); @@ -127,6 +127,6 @@ // create a new detProcessedImfile object detProcessedImfileRow *detRow = detProcessedImfileRowAlloc( - (psS64)atoll(det_id), - (psS64)atoll(exp_id), + det_id, + exp_id, class_id, uri, @@ -144,4 +144,5 @@ user_5, path_base, + "full", code ); @@ -172,6 +173,6 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); @@ -261,6 +262,6 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); @@ -294,17 +295,28 @@ } +bool updateprocessedimfileMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false); + PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); + PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false); + + if (!setProcessedImfileDataState(config, det_id, exp_id, class_id, data_state)) { + return false; + } + return true; +} + bool pendingcleanup_processedimfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, NULL); - PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psMetadata *where = psMetadataAlloc(); - if (chip_id) { - PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); - } - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "detProcessedImfile.det_id", "=="); psString query = pxDataGet("dettool_pendingcleanup_processedimfile.sql"); @@ -347,5 +359,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_processedimfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "detCleanupProcessedImfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -358,5 +370,5 @@ } - +// XXX SQL missing bool donecleanup_processedimfileMode(pxConfig *config) { Index: /branches/eam_branch_20080719/ippTools/src/dettool_residexp.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool_residexp.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool_residexp.c (revision 18991) @@ -88,11 +88,11 @@ // limit search by det_id, iteration, exp_id psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); - - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); + + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false); - PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false); // required + PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false); // required PXOPT_LOOKUP_S16(code, config->args, "-code", false, false); PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (code == 0), false); // Required if code == 0 @@ -150,8 +150,9 @@ psFree(output); - if (!detResidExpInsert(config->dbh, - (psS64)atoll(det_id), + if (!detResidExpInsert( + config->dbh, + det_id, iteration, - (psS64)atoll(exp_id), + exp_id, recipe, bg, @@ -173,4 +174,5 @@ user_5, path_base, + "full", !reject, code @@ -188,7 +190,7 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_STR(config->args, where, "-recip", "recipe", "=="); @@ -268,7 +270,7 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); @@ -310,7 +312,7 @@ // build a query to search by det_id, iteration, exp_id psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); // find the values we're going to set @@ -323,4 +325,11 @@ PXOPT_COPY_F64(config->args, set, "-bg_mean_stdev", "bg_mean_stdev", "=="); PXOPT_COPY_STR(config->args, set, "-path_base", "path_base", "=="); + PXOPT_COPY_STR(config->args, set, "-data_state", "data_state", "=="); + + // double-check the allowed data_state values + PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", false, false); + if (data_state) { + if (!isValidDataState (data_state)) return false; + } // this can't be PXOPT_ macro-ized as reject is !'d @@ -348,13 +357,9 @@ PS_ASSERT_PTR_NON_NULL(config, NULL); - PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psMetadata *where = psMetadataAlloc(); - if (chip_id) { - PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); - } - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "detProcessedImfile.det_id", "=="); psString query = pxDataGet("dettool_pendingcleanup_residexp.sql"); @@ -397,5 +402,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_residexp", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "detCleanupResidExp", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: /branches/eam_branch_20080719/ippTools/src/dettool_residimfile.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool_residimfile.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool_residimfile.c (revision 18991) @@ -76,7 +76,7 @@ - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false); - PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false); // required + PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false); // required PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); // required PXOPT_LOOKUP_S16(code, config->args, "-code", false, false); @@ -102,8 +102,9 @@ PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); - if (!detResidImfileInsert(config->dbh, - (psS64)atoll(det_id), + if (!detResidImfileInsert( + config->dbh, + det_id, iteration, - (psS64)atoll(exp_id), + exp_id, class_id, uri, @@ -127,4 +128,5 @@ user_5, path_base, + "full", code )) { @@ -142,7 +144,7 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); PXOPT_COPY_STR(config->args, where, "-recip", "recipe", "=="); @@ -225,7 +227,7 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); @@ -259,17 +261,28 @@ } +bool updateresidimfileMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false); + PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false); + PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); + PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false); + if (!setResidImfileDataState(config, det_id, iteration, exp_id, class_id, data_state)) { + return false; + } + return true; +} + bool pendingcleanup_residimfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, NULL); - PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psMetadata *where = psMetadataAlloc(); - if (chip_id) { - PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); - } - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "detProcessedImfile.det_id", "=="); psString query = pxDataGet("dettool_pendingcleanup_residimfile.sql"); @@ -312,5 +325,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_residimfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "detCleanupResidImfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: /branches/eam_branch_20080719/ippTools/src/dettool_stack.c =================================================================== --- /branches/eam_branch_20080719/ippTools/src/dettool_stack.c (revision 18990) +++ /branches/eam_branch_20080719/ippTools/src/dettool_stack.c (revision 18991) @@ -78,5 +78,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); @@ -123,5 +123,5 @@ // det_id, iteration, class_id, uri, & recipe are required - PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false); PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false); @@ -175,5 +175,5 @@ // create a new detStackedImfile object detStackedImfileRow *stackedImfile = detStackedImfileRowAlloc( - (psS64)atoll(det_id), + det_id, iteration, class_id, @@ -208,5 +208,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); @@ -282,5 +282,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "=="); PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "=="); PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); @@ -315,17 +315,28 @@ } +bool updatestackedMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); + PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false); + PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false); + + if (!setStackedImfileDataState(config, det_id, iteration, data_state)) { + return false; + } + return true; +} + bool pendingcleanup_stackedMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, NULL); - PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psMetadata *where = psMetadataAlloc(); - if (chip_id) { - PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); - } - PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_S64(config->args, where, "-det_id", "detStackedImfile.det_id", "=="); + PXOPT_COPY_S32(config->args, where, "-iteration", "detStackedImfile.iteration", "=="); psString query = pxDataGet("dettool_pendingcleanup_stacked.sql"); @@ -368,5 +379,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_stacked", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "detCleanupStackedImfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -379,5 +390,5 @@ } - +// XXX SQL missing bool donecleanup_stackedMode(pxConfig *config) {