Index: /trunk/ippTools/src/camtool.c =================================================================== --- /trunk/ippTools/src/camtool.c (revision 13579) +++ /trunk/ippTools/src/camtool.c (revision 13580) @@ -23,4 +23,5 @@ #include +#include #include @@ -434,4 +435,14 @@ } + psString chip_id = psMetadataLookupStr(&status, config->args, "-chip_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -chip_id"); + return false; + } + if (!chip_id) { + psError(PS_ERR_UNKNOWN, true, "-chip_id is required"); + return false; + } + psString uri = psMetadataLookupStr(&status, config->args, "-uri"); if (!status) { @@ -520,5 +531,5 @@ // default - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); @@ -714,7 +725,11 @@ bool status = false; - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); + return false; + } + if (code == INT16_MAX) { + psError(PS_ERR_UNKNOWN, true, "-code is required"); return false; } Index: /trunk/ippTools/src/camtoolConfig.c =================================================================== --- /trunk/ippTools/src/camtoolConfig.c (revision 13579) +++ /trunk/ippTools/src/camtoolConfig.c (revision 13580) @@ -22,6 +22,8 @@ #endif +#include +#include + #include -#include #include "pxtools.h" @@ -136,9 +138,9 @@ "define URI (required)", NULL); psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0, - "define exposue background (required)", NAN); + "define exposue background", NAN); psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposue background stdev (required)", NAN); + "define exposue background stdev", NAN); psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, - "define exposue background mean stdev (required)", NAN); + "define exposue background mean stdev", NAN); psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_ra", 0, "define exposure E ra (required)", NAN); @@ -182,10 +184,10 @@ "search by class ID", NULL); psMetadataAddS16(updateprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", 0); + "set fault code (required)", INT16_MAX); // -block psMetadata *blockArgs = psMetadataAlloc(); psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label", 0, - "name of a label to mask out", NULL); + "name of a label to mask out (required)", NULL); // -masked @@ -197,5 +199,5 @@ psMetadata *unblockArgs = psMetadataAlloc(); psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label", 0, - "name of a label to unmask", NULL); + "name of a label to unmask (required)", NULL); psMetadata *argSets = psMetadataAlloc(); Index: /trunk/ippTools/src/chiptool.c =================================================================== --- /trunk/ippTools/src/chiptool.c (revision 13579) +++ /trunk/ippTools/src/chiptool.c (revision 13580) @@ -24,5 +24,7 @@ #include #include +#include #include +#include #include "pxtools.h" @@ -599,7 +601,11 @@ bool status = false; - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); + return false; + } + if (code == INT16_MAX) { + psError(PS_ERR_UNKNOWN, true, "-code is required"); return false; } @@ -831,8 +837,4 @@ return false; } - if (!uri) { - psError(PS_ERR_UNKNOWN, true, "-uri is required"); - return false; - } psF64 bg = psMetadataLookupF64(&status, config->args, "-bg"); @@ -862,5 +864,5 @@ // default values - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); Index: /trunk/ippTools/src/chiptoolConfig.c =================================================================== --- /trunk/ippTools/src/chiptoolConfig.c (revision 13579) +++ /trunk/ippTools/src/chiptoolConfig.c (revision 13580) @@ -21,4 +21,6 @@ #include #endif + +#include #include @@ -124,5 +126,5 @@ "define chip ID (required)", NULL); psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID", NULL); + "define class ID (requied)", NULL); psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri", 0, "define URL", NULL); @@ -135,5 +137,5 @@ psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); @@ -141,5 +143,5 @@ psMetadata *processedimfileArgs = psMetadataAlloc(); psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, - "define chip ID (required)", NULL); + "define chip ID", NULL); psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, "define exposure ID", NULL); @@ -164,5 +166,5 @@ psMetadata *updateprocessedimfileArgs = psMetadataAlloc(); psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, - "define chip ID (required)", NULL); + "define chip ID", NULL); psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exposure ID", NULL); @@ -171,6 +173,6 @@ 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); + psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, + "set fault code (required)", INT16_MAX); // -retryprocessedimfile @@ -188,5 +190,5 @@ psMetadata *blockArgs = psMetadataAlloc(); psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label", 0, - "name of a label to mask out", NULL); + "name of a label to mask out (required)", NULL); // -masked @@ -198,5 +200,5 @@ psMetadata *unblockArgs = psMetadataAlloc(); psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label", 0, - "name of a label to unmask", NULL); + "name of a label to unmask (required)", NULL); psMetadata *argSets = psMetadataAlloc(); Index: /trunk/ippTools/src/dettool.c =================================================================== --- /trunk/ippTools/src/dettool.c (revision 13579) +++ /trunk/ippTools/src/dettool.c (revision 13580) @@ -2247,5 +2247,5 @@ // default values - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); @@ -2481,5 +2481,5 @@ // default values - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); @@ -2947,5 +2947,5 @@ } - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); @@ -3332,5 +3332,5 @@ // default values - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); @@ -3839,5 +3839,5 @@ } - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); @@ -4069,5 +4069,5 @@ // default values - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); @@ -4590,5 +4590,5 @@ // default values - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); @@ -5108,5 +5108,5 @@ // default values - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); @@ -5661,5 +5661,5 @@ } // default values - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); Index: /trunk/ippTools/src/dettoolConfig.c =================================================================== --- /trunk/ippTools/src/dettoolConfig.c (revision 13579) +++ /trunk/ippTools/src/dettoolConfig.c (revision 13580) @@ -311,5 +311,5 @@ psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -358,5 +358,5 @@ psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddS8(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -399,5 +399,5 @@ psMetadataAddStr(addstackedArgs, PS_LIST_TAIL, "-uri", 0, "define URI (required)", NULL); - psMetadataAddS8(addstackedArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addstackedArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -436,5 +436,5 @@ psMetadataAddF32(addnormstatArgs, PS_LIST_TAIL, "-norm", 0, "define normal value (required)", NAN); - psMetadataAddS8(addnormstatArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addnormstatArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -464,5 +464,5 @@ psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddS8(addnormalizedimfileArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addnormalizedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -490,5 +490,5 @@ psMetadataAddStr(addnormalizedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddS8(addnormalizedexpArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addnormalizedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -569,5 +569,5 @@ psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddS8(addresidimfileArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addresidimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); @@ -609,5 +609,5 @@ psMetadataAddStr(addresidexpArgs, PS_LIST_TAIL, "-path_base", 0, "define banana 1", NULL); - psMetadataAddS8(addresidexpArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addresidexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); psMetadataAddBool(addresidexpArgs, PS_LIST_TAIL, "-reject", 0, @@ -673,5 +673,5 @@ psMetadataAddF64(adddetrunsummaryArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - psMetadataAddS8(adddetrunsummaryArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(adddetrunsummaryArgs, PS_LIST_TAIL, "-code", 0, "set fault code (required)", 0); psMetadataAddBool(adddetrunsummaryArgs, PS_LIST_TAIL, "-accept", 0, Index: /trunk/ippTools/src/difftoolConfig.c =================================================================== --- /trunk/ippTools/src/difftoolConfig.c (revision 13579) +++ /trunk/ippTools/src/difftoolConfig.c (revision 13580) @@ -80,7 +80,7 @@ "define warp ID (required)", NULL); psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, - "define by skycell ID", NULL); + "define by skycell ID (required)", NULL); psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, - "dfine tess ID", NULL); + "dfine tess ID (required)", NULL); psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-kind", 0, "define kind", NULL); Index: /trunk/ippTools/src/pxconfig.c =================================================================== --- /trunk/ippTools/src/pxconfig.c (revision 13579) +++ /trunk/ippTools/src/pxconfig.c (revision 13580) @@ -157,16 +157,40 @@ break; case PS_DATA_S8: + if (item->data.S8 != INT8_MAX) { + break; + } + goto ARG_REQUIRED; case PS_DATA_S16: + if (item->data.S16 != INT16_MAX) { + break; + } + goto ARG_REQUIRED; case PS_DATA_S32: + if (item->data.S32 != INT32_MAX) { + break; + } + goto ARG_REQUIRED; case PS_DATA_S64: - if (item->data.S64 != 0) { + if (item->data.S64 != INT64_MAX) { break; } goto ARG_REQUIRED; case PS_DATA_U8: + if (item->data.U8 != UINT8_MAX) { + break; + } + goto ARG_REQUIRED; case PS_DATA_U16: + if (item->data.U16 != UINT16_MAX) { + break; + } + goto ARG_REQUIRED; case PS_DATA_U32: + if (item->data.U32 != UINT32_MAX) { + break; + } + goto ARG_REQUIRED; case PS_DATA_U64: - if (item->data.U64 != 0) { + if (item->data.U64 != UINT64_MAX) { break; } Index: /trunk/ippTools/src/pxfault.c =================================================================== --- /trunk/ippTools/src/pxfault.c (revision 13579) +++ /trunk/ippTools/src/pxfault.c (revision 13580) @@ -26,5 +26,5 @@ #include "pxtools.h" -bool pxSetFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS8 code) +bool pxSetFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS16 code) { PS_ASSERT_PTR_NON_NULL(dbh, false); @@ -43,5 +43,5 @@ // update the database psMetadata *values = psMetadataAlloc(); - if (!psMetadataAddS8(values, PS_LIST_HEAD, "fault", 0, NULL, code)) { + if (!psMetadataAddS16(values, PS_LIST_HEAD, "fault", 0, NULL, code)) { psError(PS_ERR_UNKNOWN, false, "failed to add metadata item fault"); psFree(values); Index: /trunk/ippTools/src/pxtools.h =================================================================== --- /trunk/ippTools/src/pxtools.h (revision 13579) +++ /trunk/ippTools/src/pxtools.h (revision 13580) @@ -50,5 +50,5 @@ bool pxDeleteTables (pxConfig *config); -bool pxSetFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS8 code); +bool pxSetFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS16 code); psExit pxerrorGetExitStatus (); Index: /trunk/ippTools/src/regtool.c =================================================================== --- /trunk/ippTools/src/regtool.c (revision 13579) +++ /trunk/ippTools/src/regtool.c (revision 13580) @@ -23,4 +23,6 @@ #include +#include +#include #include "pxtools.h" @@ -422,7 +424,11 @@ bool status = false; - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); + return false; + } + if (code == INT16_MAX) { + psError(PS_ERR_UNKNOWN, true, "-code is required"); return false; } @@ -753,7 +759,11 @@ { bool status = false; - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); + return false; + } + if (code == INT16_MAX) { + psError(PS_ERR_UNKNOWN, true, "-code is required"); return false; } @@ -946,5 +956,5 @@ // default - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); @@ -1099,5 +1109,5 @@ } - psS8 code = psMetadataLookupS8(&status, config->args, "-code"); + psS16 code = psMetadataLookupS16(&status, config->args, "-code"); if (!status) { psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); Index: /trunk/ippTools/src/regtoolConfig.c =================================================================== --- /trunk/ippTools/src/regtoolConfig.c (revision 13579) +++ /trunk/ippTools/src/regtoolConfig.c (revision 13580) @@ -22,6 +22,8 @@ #endif +#include +#include + #include -#include #include "pxtools.h" @@ -60,7 +62,7 @@ psMetadata *addprocessedimfileArgs = psMetadataAlloc(); psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0, - "define exposure ID", NULL); + "define exposure ID (required)", NULL); psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, - "define class ID", NULL); + "define class ID (required)", NULL); psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); @@ -95,5 +97,5 @@ psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-dateobs", 0, "define observation time", NULL); - psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); @@ -117,6 +119,6 @@ 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); + psMetadataAddS16(updateprocessedimfileArgs, PS_LIST_TAIL, "-code", 0, + "set fault code (required)", INT16_MAX); @@ -178,5 +180,5 @@ psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-label", 0, "define label for phase 2 processing (non-detrend data only)", NULL); - psMetadataAddS8(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, + psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); /* @@ -204,6 +206,6 @@ psMetadataAddStr(updatedprocessedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exposure ID", NULL); - psMetadataAddS8(updatedprocessedexpArgs, PS_LIST_TAIL, "-code", 0, - "set fault code (required)", 0); + psMetadataAddS16(updatedprocessedexpArgs, PS_LIST_TAIL, "-code", 0, + "set fault code (required)", INT16_MAX); Index: /trunk/ippTools/src/stacktoolConfig.c =================================================================== --- /trunk/ippTools/src/stacktoolConfig.c (revision 13579) +++ /trunk/ippTools/src/stacktoolConfig.c (revision 13580) @@ -87,7 +87,7 @@ psMetadata *inputskyfileArgs = psMetadataAlloc(); psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, - "search by stack ID (required)", NULL); + "search by stack ID", NULL); psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warp ID (required)", NULL); + "search by warp ID", NULL); psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); @@ -120,7 +120,7 @@ psMetadata *sumskyfileArgs= psMetadataAlloc(); psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, - "search by stack ID (required)", NULL); + "search by stack ID", NULL); psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warp ID (required)", NULL); + "search by warp ID", NULL); psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); Index: /trunk/ippTools/src/warptoolConfig.c =================================================================== --- /trunk/ippTools/src/warptoolConfig.c (revision 13579) +++ /trunk/ippTools/src/warptoolConfig.c (revision 13580) @@ -21,4 +21,6 @@ #include #endif + +#include #include