Index: /trunk/ippTools/src/chiptool.c =================================================================== --- /trunk/ippTools/src/chiptool.c (revision 11032) +++ /trunk/ippTools/src/chiptool.c (revision 11033) @@ -33,8 +33,10 @@ static bool pendingimfileMode(pxConfig *config); static bool addprocessedimfileMode(pxConfig *config); -static bool faultimfileMode(pxConfig *config); +static bool processedimfileMode(pxConfig *config); +static bool updateprocessedimfileMode(pxConfig *config); static bool blockMode(pxConfig *config); static bool maskedMode(pxConfig *config); static bool unblockMode(pxConfig *config); + static p2ProcessedImfileRow *p2PendingToProcessedImfile(pxConfig *config, p2PendingImfileRow *imfile); static p2ProcessedExpRow *p2PendingToProcessedExp(pxConfig *config, p2PendingExpRow *pendingExp); @@ -59,5 +61,6 @@ MODECASE(P2TOOL_MODE_PENDINGIMFILE, pendingimfileMode); MODECASE(P2TOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileMode); - MODECASE(P2TOOL_MODE_FAULTIMFILE, faultimfileMode); + MODECASE(P2TOOL_MODE_PROCESSEDIMFILE, processedimfileMode); + MODECASE(P2TOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode); MODECASE(P2TOOL_MODE_BLOCK, blockMode); MODECASE(P2TOOL_MODE_MASKED, maskedMode); @@ -183,10 +186,4 @@ } - bool faulted = psMetadataLookupU64(&status, config->args, "-faulted"); - if (!status) { - psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted"); - return false; - } - // XXX does this need to be constrained so that it won't return any results // if a match p2PendingExp hasn't been registered? @@ -212,12 +209,4 @@ } - if (faulted) { - // list only faulted rows - psStringAppend(&query, " %s", "AND p2PendingImfile.fault != 0"); - } else { - // don't list faulted rows - psStringAppend(&query, " %s", "AND p2PendingImfile.fault = 0"); - } - // treat limit == 0 as "no limit" if (limit) { @@ -433,5 +422,98 @@ -static bool faultimfileMode(pxConfig *config) +static bool processedimfileMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + bool status = false; + psU64 limit = psMetadataLookupU64(&status, config->args, "-limit"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit"); + return false; + } + + bool faulted = psMetadataLookupU64(&status, config->args, "-faulted"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted"); + return false; + } + + // XXX does this need to be constrained so that it won't return any results + // if a match p2PendingExp hasn't been registered? + psString query = psStringCopy( + "SELECT" + " p2ProcessedImfile.*," + " rawScienceExp.camera" + " FROM p2ProcessedImfile" + " JOIN rawScienceExp" + " USING(exp_tag)" + " WHERE " + " p2ProcessedImfile.exp_tag is NOT NULL" // bogus test -- just here so there there is a 'WHERE' stmt to append conditionals too + ); + + if (config->where) { + psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p2ProcessedImfile"); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + + if (faulted) { + // list only faulted rows + psStringAppend(&query, " %s", "AND p2ProcessedImfile.fault != 0"); + } else { + // don't list faulted rows + psStringAppend(&query, " %s", "AND p2ProcessedImfile.fault = 0"); + } + + // treat limit == 0 as "no limit" + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + // XXX check psError here + psError(PS_ERR_UNKNOWN, false, "no p2ProcessedImfile rows found"); + psFree(output); + return true; + } + + bool simple = false; + { + bool status = false; + simple = psMetadataLookupBool(&status, config->args, "-simple"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple"); + return false; + } + } + + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "p2ProcessedImfile", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + + psFree(output); + + return true; +} + + +static bool updateprocessedimfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -444,5 +526,5 @@ } - if (!pxSetFaultCode(config->dbh, "p2PendingImfile", config->where, code)) { + if (!pxSetFaultCode(config->dbh, "p2ProcessedImfile", config->where, code)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); return false; @@ -733,4 +815,11 @@ } + // default values + psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); + return false; + } + return p2ProcessedImfileRowAlloc( imfile->exp_tag, @@ -744,5 +833,6 @@ b2_uri, imfile->p1_version, - imfile->p2_version + imfile->p2_version, + code ); } Index: /trunk/ippTools/src/chiptool.h =================================================================== --- /trunk/ippTools/src/chiptool.h (revision 11032) +++ /trunk/ippTools/src/chiptool.h (revision 11033) @@ -29,5 +29,6 @@ P2TOOL_MODE_PENDINGIMFILE, P2TOOL_MODE_ADDPROCESSEDIMFILE, - P2TOOL_MODE_FAULTIMFILE, + P2TOOL_MODE_PROCESSEDIMFILE, + P2TOOL_MODE_UPDATEPROCESSEDIMFILE, P2TOOL_MODE_BLOCK, P2TOOL_MODE_MASKED, Index: /trunk/ippTools/src/chiptoolConfig.c =================================================================== --- /trunk/ippTools/src/chiptoolConfig.c (revision 11032) +++ /trunk/ippTools/src/chiptoolConfig.c (revision 11033) @@ -47,8 +47,4 @@ // -pendingimfile psMetadata *pendingimfileArgs = psMetadataAlloc(); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst", 0, - "define camera of interest", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-filter", 0, - "define filter of interest", NULL); psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, "define exposure ID", NULL); @@ -57,10 +53,12 @@ psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class ID", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst", 0, + "define camera of interest", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-filter", 0, + "define filter of interest", NULL); psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-uri", 0, "define URL", NULL); psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); + "limit result set to N items", 0); psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -86,15 +84,38 @@ psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-b2_uri", 0, "define banana 2", NULL); - - // -faultimfile - psMetadata *faultimfileArgs = psMetadataAlloc(); - psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exposure ID", NULL); - psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-class", 0, - "search by class", NULL); - psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "search by class ID", NULL); - psMetadataAddS8(faultimfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", 0); + psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, + "set fault code (required)", 0); + + // -processedimfile + psMetadata *processedimfileArgs = psMetadataAlloc(); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, + "define exposure ID", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class", 0, + "define class", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id", 0, + "define class ID", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-inst", 0, + "define camera of interest", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-filter", 0, + "define filter of interest", NULL); + psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-uri", 0, + "define URL", NULL); + psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit", 0, + "limit result set to N items", 0); + psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted", 0, + "only return imfiles with a fault status set", false); + psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -updateprocessedimfile + psMetadata *updateprocessedimfileArgs = psMetadataAlloc(); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, + "search by exposure ID", NULL); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class", 0, + "search by class", NULL); + psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, + "search by class ID", NULL); + psMetadataAddS8(updateprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, + "set fault code (required)", 0); @@ -133,12 +154,13 @@ psMetadata *argSets = psMetadataAlloc(); - PXTOOL_MODE("-quick", P2TOOL_MODE_QUICK, quickArgs); - PXTOOL_MODE("-define", P2TOOL_MODE_DEFINE, defineArgs); - PXTOOL_MODE("-pendingimfile", P2TOOL_MODE_PENDINGIMFILE, pendingimfileArgs); + PXTOOL_MODE("-quick", P2TOOL_MODE_QUICK, quickArgs); + PXTOOL_MODE("-define", P2TOOL_MODE_DEFINE, defineArgs); + PXTOOL_MODE("-pendingimfile", P2TOOL_MODE_PENDINGIMFILE, pendingimfileArgs); PXTOOL_MODE("-addprocessedimfile",P2TOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs); - PXTOOL_MODE("-faultimfile", P2TOOL_MODE_FAULTIMFILE, faultimfileArgs); - PXTOOL_MODE("-block", P2TOOL_MODE_BLOCK, blockArgs); - PXTOOL_MODE("-masked", P2TOOL_MODE_MASKED, maskedArgs); - PXTOOL_MODE("-unblock", P2TOOL_MODE_UNBLOCK, unblockArgs); + PXTOOL_MODE("-processedimfile",P2TOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); + PXTOOL_MODE("-updateprocessedimfile",P2TOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); + PXTOOL_MODE("-block", P2TOOL_MODE_BLOCK, blockArgs); + PXTOOL_MODE("-masked", P2TOOL_MODE_MASKED, maskedArgs); + PXTOOL_MODE("-unblock", P2TOOL_MODE_UNBLOCK, unblockArgs); bool argErr = false; Index: /trunk/ippTools/src/regtool.c =================================================================== --- /trunk/ippTools/src/regtool.c (revision 11032) +++ /trunk/ippTools/src/regtool.c (revision 11033) @@ -800,6 +800,5 @@ 0xff, // XXX calc version number 0xff, // XXX calc version number - label, - 0 // fault code + label ); @@ -815,6 +814,5 @@ "my recipe", 0xff, // XXX calc version number - 0xff, // XXX calc version number - 0 // fault code + 0xff // XXX calc version number ); }