Index: trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_create_tables.sql (revision 35041) +++ trunk/ippTools/share/pxadmin_create_tables.sql (revision 35048) @@ -2161,9 +2161,11 @@ surveyID INT(8), releaseName VARCHAR(64), - state VARCHAR(16), -- active, pending archive drop + relase_state VARCHAR(16), -- active, pending, archive, drop dataRelease INT(8), -- PSPS dataRelease + priority INT(8), PRIMARY KEY(rel_id), KEY(releaseName), KEY(state), + KEY(priority), FOREIGN KEY(surveyID) REFERENCES survey(surveyID) ) ENGINE=Innodb DEFAULT CHARSET=latin1; @@ -2191,5 +2193,29 @@ ) ENGINE=innodb DEFAULT CHARSET=latin1; - --- This comment line is here to avoid empty query error. +CREATE TABLE relStack ( + relstack_id BIGINT AUTO_INCREMENT, + rel_id INT(8), + skycal_id BIGINT, -- id of the sky calibration run that supplied the calibration + -- for this release. We get back to stack from here + skycell_id varchar(64), + tess_id varchar(64), + state VARCHAR(16), -- released, pending, archive, drop + flags INT UNSIGNED, + stack_type VARCHAR(16), -- nightly, deep, reference + zpt_obs FLOAT, -- calibrated zero point for this release of this skycell + zpt_stdev FLOAT, + fwhm_major FLOAT, -- seeing as measured by staticsky + path_base VARCHAR(255), -- path_base of any supporting files, + registered DATETIME, + time_stamp DATETIME, + PRIMARY KEY (relstack_id), + KEY (tess_id, skycell_id), + KEY (rel_id, tess_id, skycell_id), + FOREIGN KEY(rel_id) REFERENCES ippRelease(rel_id), + FOREIGN KEY(skycal_id) REFERENCES skycalRun(skycal_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + + + +-- These comment lines are here to avoid an empty query error. -- Another way to avoid that problem is to omit the semicolon above but I think that is untidy. Index: trunk/ippTools/share/releasetool_listrelexp.sql =================================================================== --- trunk/ippTools/share/releasetool_listrelexp.sql (revision 35041) +++ trunk/ippTools/share/releasetool_listrelexp.sql (revision 35048) @@ -1,9 +1,11 @@ SELECT relexp_id, - releaseName, relExp.state, - rel_id, + ippRelease.releaseName, + ippRelease.release_state, + ippRelease.rel_id, + ippRelease.priority, survey.surveyName, - exp_name, + rawExp.exp_name, relExp.flags, relExp.zpt_obs, @@ -12,12 +14,12 @@ relExp.registered, relExp.time_stamp, - exp_id, - chip_id, + relExp.exp_id, + relExp.chip_id, chipRun.state as chip_state, - cam_id, + relExp.cam_id, camRun.state as cam_state, camProcessedExp.path_base as cam_path_base, camProcessedExp.fwhm_major, - warp_id, + warpRun.warp_id, warpRun.state as warp_state, rawExp.filter, @@ -25,5 +27,4 @@ TRUNCATE(DEGREES(rawExp.ra), 4) AS radeg, TRUNCATE(DEGREES(rawExp.decl), 4) AS decdeg, - rawExp.object, rawExp.comment FROM relExp Index: trunk/ippTools/src/releasetool.c =================================================================== --- trunk/ippTools/src/releasetool.c (revision 35041) +++ trunk/ippTools/src/releasetool.c (revision 35048) @@ -119,10 +119,5 @@ psFree(whereClause); } else { - // The list of surveys is short there is no need to require parameters -#ifdef notdef - psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required\n"); - psFree(where); - return false; -#endif + // carry on The list of surveys is short there is no need to require parameters } @@ -167,8 +162,9 @@ PS_ASSERT_PTR_NON_NULL(config, false); + PXOPT_LOOKUP_S32(surveyID, config->args, "-set_surveyID", true, false); PXOPT_LOOKUP_STR(releaseName, config->args, "-set_releaseName", true, false); - PXOPT_LOOKUP_S32(surveyID, config->args, "-set_surveyID", true, false); + PXOPT_LOOKUP_STR(release_state, config->args, "-set_release_state", true, false); PXOPT_LOOKUP_S32(dataRelease, config->args, "-set_dataRelease", false, false); - PXOPT_LOOKUP_STR(state, config->args, "-set_state", true, false); + PXOPT_LOOKUP_S32(priority, config->args, "-set_priority", false, false); if (!ippReleaseInsert(config->dbh, @@ -176,6 +172,7 @@ surveyID, releaseName, - state, - dataRelease + release_state, + dataRelease, + priority )) { psError(PS_ERR_UNKNOWN, false, "failed to insert ippRelease"); @@ -197,5 +194,5 @@ return false; } - PXOPT_LOOKUP_STR(state, config->args, "-set_state", true, false); + PXOPT_LOOKUP_STR(release_state, config->args, "-set_release_state", true, false); psMetadata *where = psMetadataAlloc(); @@ -205,5 +202,5 @@ psString query = NULL; - psStringAppend(&query, "UPDATE ippRelease SET state = '%s'", state); + psStringAppend(&query, "UPDATE ippRelease SET release_state = '%s'", release_state); psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); @@ -236,5 +233,5 @@ PXOPT_COPY_STR(config->args, where, "-surveyName", "surveyName", "LIKE"); PXOPT_COPY_STR(config->args, where, "-releaseName", "releaseName", "LIKE"); - PXOPT_COPY_STR(config->args, where, "-state", "state", "=="); + PXOPT_COPY_STR(config->args, where, "-release_state", "release_state", "=="); PXOPT_COPY_S32(config->args, where, "-rel_id", "rel_id", "=="); @@ -251,9 +248,9 @@ } else { // The list of releases is short there is no need to require parameters - #ifdef notyet + #ifdef notyet psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required\n"); psFree(where); return false; - #endif + #endif } @@ -294,146 +291,146 @@ } - static bool definerelexpMode(pxConfig *config) - { - PS_ASSERT_PTR_NON_NULL(config, NULL); - - psMetadata *where = psMetadataAlloc(); - - PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "=="); - PXOPT_COPY_STR(config->args, where, "-data_group", "camRun.data_group", "=="); - PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); - - // Insure that at least one of the camRun selectors is supplied - if (!psListLength(where->list)) { - psFree(where); - psError(PXTOOLS_ERR_CONFIG, false, "at least one of -label, -data_group, or -cam_id is required"); - return false; - } - - PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); - PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "=="); - - // insure that at least one of these is supplied to select the release - PXOPT_LOOKUP_S64(rel_id, config->args, "-rel_id", false, false); - PXOPT_LOOKUP_STR(releaseName, config->args, "-releaseName", false, false); - if (!rel_id && !releaseName) { - psError(PXTOOLS_ERR_CONFIG, true, "either -rel_id or -releaseName is required"); - return false; - } - - // limit query to the target release. (Note: this will select nothing of releaseName and rel_id don't match) - // note: we add these after above to insure that search args are supplied - PXOPT_COPY_STR(config->args, where, "-releaseName", "ippRelease.releaseName", "=="); - PXOPT_COPY_S32(config->args, where, "-rel_id", "ippRelease.rel_id", "=="); - - - PXOPT_LOOKUP_STR(state, config->args, "-set_state", true, false); - PXOPT_LOOKUP_U32(flags, config->args, "-set_flags", false, false); - PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false); - - PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - - // find the parameters of all the exposures that we want to add to the release - psString query = pxDataGet("releasetool_definerelexp.sql"); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - psFree(where); - return false; - } - - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - +static bool definerelexpMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + psMetadata *where = psMetadataAlloc(); + + PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "=="); + PXOPT_COPY_STR(config->args, where, "-data_group", "camRun.data_group", "=="); + PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); + + // Insure that at least one of the camRun selectors is supplied + if (!psListLength(where->list)) { psFree(where); - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } + psError(PXTOOLS_ERR_CONFIG, false, "at least one of -label, -data_group, or -cam_id is required"); + return false; + } + + PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "=="); + + // insure that at least one of these is supplied to select the release + PXOPT_LOOKUP_S64(rel_id, config->args, "-rel_id", false, false); + PXOPT_LOOKUP_STR(releaseName, config->args, "-releaseName", false, false); + if (!rel_id && !releaseName) { + psError(PXTOOLS_ERR_CONFIG, true, "either -rel_id or -releaseName is required"); + return false; + } + + // limit query to the target release. (Note: this will select nothing of releaseName and rel_id don't match) + // note: we add these after above to insure that search args are supplied + PXOPT_COPY_STR(config->args, where, "-releaseName", "ippRelease.releaseName", "=="); + PXOPT_COPY_S32(config->args, where, "-rel_id", "ippRelease.rel_id", "=="); + + + PXOPT_LOOKUP_STR(state, config->args, "-set_state", true, false); + PXOPT_LOOKUP_U32(flags, config->args, "-set_flags", false, false); + PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false); + + PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + // find the parameters of all the exposures that we want to add to the release + psString query = pxDataGet("releasetool_definerelexp.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + + psFree(where); + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); psFree(query); - - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("releasetool", PS_LOG_INFO, "no rows found"); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + psTrace("releasetool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (pretend) { + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "chipRun", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); - return true; - } - - if (pretend) { - // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "chipRun", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; + return false; + } + psFree(output); + return true; + } + + if (!psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(output); + return false; + } + + psTime *now = psTimeGetNow(PS_TIME_TAI); + // loop over our list of exposures + for (long i = 0; i < psArrayLength(output); i++) { + psMetadata *md = output->data[i]; + + bool status = true; + psS32 rel_id = psMetadataLookupS32(&status, md, "rel_id"); + psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id"); + psS64 chip_id = psMetadataLookupS64(&status, md, "chip_id"); + psS64 cam_id = psMetadataLookupS64(&status, md, "cam_id"); + psF32 zpt_obs = psMetadataLookupF32(&status, md, "zpt_obs"); + psF32 zpt_stdev = psMetadataLookupF32(&status, md, "zpt_stdev"); + + if (!relExpInsert(config->dbh, + 0, // relexp_id (auto increment) + rel_id, + exp_id, + chip_id, + cam_id, + state, + flags, + zpt_obs, + zpt_stdev, + path_base, + now, // registered + now // time_stamp + )) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to insert relExp for cam_id %" PRId64, cam_id); psFree(output); - return true; - } - - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(output); - return false; - } - - psTime *now = psTimeGetNow(PS_TIME_TAI); - // loop over our list of exposures - for (long i = 0; i < psArrayLength(output); i++) { - psMetadata *md = output->data[i]; - - bool status = true; - psS32 rel_id = psMetadataLookupS32(&status, md, "rel_id"); - psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id"); - psS64 chip_id = psMetadataLookupS64(&status, md, "chip_id"); - psS64 cam_id = psMetadataLookupS64(&status, md, "cam_id"); - psF32 zpt_obs = psMetadataLookupF32(&status, md, "zpt_obs"); - psF32 zpt_stdev = psMetadataLookupF32(&status, md, "zpt_stdev"); - - if (!relExpInsert(config->dbh, - 0, // relexp_id (auto increment) - rel_id, - exp_id, - chip_id, - cam_id, - state, - flags, - zpt_obs, - zpt_stdev, - path_base, - now, // registered - now // time_stamp - )) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, - "failed to trying to insert relExp for cam_id %" PRId64, cam_id); - psFree(output); - psFree(now); - return false; - } - } - psFree(output); - - if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - return true; - } - - static bool updaterelexpMode(pxConfig *config) - { - psError(PS_ERR_UNKNOWN, true, "not yet implemented"); - return false; - } + psFree(now); + return false; + } + } + psFree(output); + + if (!psDBCommit(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + return true; +} + +static bool updaterelexpMode(pxConfig *config) +{ + psError(PS_ERR_UNKNOWN, true, "not yet implemented"); + return false; +} static bool listrelexpMode(pxConfig *config) @@ -444,5 +441,6 @@ PXOPT_COPY_STR(config->args, where, "-releaseName", "ippRelease.releaseName", "LIKE"); - PXOPT_COPY_STR(config->args, where, "-state", "ippRelease.state", "=="); + pxAddLabelSearchArgs(config, where, "-release_state","ippRelease.state", "=="); + PXOPT_COPY_STR(config->args, where, "-state", "relExp.state", "=="); PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "LIKE"); PXOPT_COPY_TIME(config->args, where, "-dateobs_begin","rawExp.dateobs", ">="); @@ -462,4 +460,6 @@ PXOPT_COPY_S32(config->args, where, "-rel_id", "relExp.rel_id", "=="); + PXOPT_LOOKUP_BOOL(priority_order, config->args, "-priority_order", false); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -494,4 +494,8 @@ } + if (priority_order) { + psStringAppend(&query, "\nAND priority > 0 order by exp_id, priority"); + } + if (limit) { psString limitString = psDBGenerateLimitSQL(limit); @@ -530,123 +534,2 @@ } -#ifdef notyet -static bool defineskycellsMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - - PXOPT_LOOKUP_STR(inputFile, config->args, "-input", true, false); - - unsigned int numBad = 0; - psMetadata *skycells = psMetadataConfigRead(NULL, &numBad, inputFile, false); - if (!skycells || numBad > 0) { - psError(PXTOOLS_ERR_UNKNOWN, false, "failed to read %s", inputFile); - return false; - } - - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - psMetadataIterator *iter = psMetadataIteratorAlloc(skycells, PS_LIST_HEAD, NULL); - - psMetadataItem *item; - int numSkycells = 0; - while ((item = psMetadataGetAndIncrement(iter))) { - if (item->type != PS_DATA_METADATA) { - psError(PS_ERR_UNKNOWN, true, "unexpected item in metadata type: %d", item->type); - return false; - } - psMetadata *md = item->data.md; - psString tess_id = psMetadataLookupStr(NULL, md, "tess_id"); - psString skycell_id = psMetadataLookupStr(NULL, md, "skycell_id"); - - skycellRow *skycell = skycellObjectFromMetadata(md); - if (!skycell) { - psError(PS_ERR_UNKNOWN, false, "failed to create skycellRow from Metadata"); - return false; - } - - numSkycells++; - if (!skycellInsertObject(config->dbh, skycell)) { - psError(PS_ERR_UNKNOWN, false, "failed to insert skycell %s %s", tess_id, skycell_id); - return false; - } - } - psFree(iter); - psFree(skycells); - - if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - psLogMsg("releasetool", PS_LOG_INFO, "%d skycells added", numSkycells); - - return true; -} -static bool listMode(pxConfig *config) -{ - PS_ASSERT_PTR_NON_NULL(config, NULL); - - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - psMetadata *where = psMetadataAlloc(); - - PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell.skycell_id", "LIKE"); - PXOPT_COPY_STR(config->args, where, "-tess_id", "skycell.tess_id", "LIKE"); - pxskycellAddWhere(config, where); - - psString query = pxDataGet("releasetool_list.sql"); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - return false; - } - - if (!psListLength(where->list)) { - psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required\n"); - psFree(where); - return false; - } - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " WHERE %s", whereClause); - psFree(whereClause); - - 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)) { - psTrace("releasetool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - if (!ippdbPrintMetadatas(stdout, output, "skycell", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - - psFree(output); - - - return true; -} - -#endif Index: trunk/ippTools/src/releasetoolConfig.c =================================================================== --- trunk/ippTools/src/releasetoolConfig.c (revision 35041) +++ trunk/ippTools/src/releasetoolConfig.c (revision 35048) @@ -62,5 +62,6 @@ psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_releaseName", 0, "define release name (required)", NULL); psMetadataAddS32(definereleaseArgs, PS_LIST_TAIL, "-set_dataRelease", 0, "define dataRelease", -1); - psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_state", 0, "define survey state", NULL); + psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_release_state", 0, "define release state", NULL); + psMetadataAddS32(definereleaseArgs, PS_LIST_TAIL, "-set_priority", 0, "define release priority", -1); // -uptdaterelease @@ -71,6 +72,7 @@ psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-rel_id", 0, "select by release ID", 0); - // Only support changing state for now - psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_state", 0, "define new survey state(required)", NULL); + // Only support changing state and priority for now + psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_release_state", 0, "define new release state(required)", NULL); + psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_priority", 0, "define new release priority", 0); // psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_surveyID", 0, "define surveyID (required)", 0); @@ -83,5 +85,5 @@ psMetadataAddStr(listreleaseArgs, PS_LIST_TAIL, "-surveyName", 0, "select by survey name (LIKE comparision)", NULL); psMetadataAddStr(listreleaseArgs, PS_LIST_TAIL, "-releaseName", 0, "select by release name (LIKE comparision)", NULL); - psMetadataAddStr(listreleaseArgs, PS_LIST_TAIL, "-state", 0, "select by release state", NULL); + psMetadataAddStr(listreleaseArgs, PS_LIST_TAIL, "-release_state", 0, "select by release state", NULL); psMetadataAddS32(listreleaseArgs, PS_LIST_TAIL, "-rel_id", 0, "select by release ID", 0); @@ -92,14 +94,14 @@ psMetadata *definerelexpArgs = psMetadataAlloc(); - // to set the target release + // set the target release psMetadataAddStr(definerelexpArgs, PS_LIST_TAIL, "-releaseName", 0, "define release name", NULL); psMetadataAddS32(definerelexpArgs, PS_LIST_TAIL, "-rel_id", 0, "define release ID", 0); - // to select the processing + // select the processing psMetadataAddS64(definerelexpArgs, PS_LIST_TAIL, "-cam_id", 0, "select by cam ID", 0); psMetadataAddStr(definerelexpArgs, PS_LIST_TAIL, "-label", 0, "select by camRun.label", NULL); psMetadataAddStr(definerelexpArgs, PS_LIST_TAIL, "-data_group", 0, "select by camRun.data_group", NULL); - // to select a specific exposure from the "processing" + // select a specific exposure from the "processing" psMetadataAddS64(definerelexpArgs, PS_LIST_TAIL, "-exp_id", 0, "select by exposure ID", 0); psMetadataAddStr(definerelexpArgs, PS_LIST_TAIL, "-exp_name", 0, "select by exposure name", NULL); @@ -122,5 +124,6 @@ psMetadata *listrelexpArgs = psMetadataAlloc(); psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-releaseName", 0, "select by release name (LIKE comparision)", NULL); - psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-state", 0, "select by release state", NULL); + psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-release_state", PS_META_DUPLICATE_OK, "select by release state", NULL); + psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-state", 0, "select by released exposure state", NULL); psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-filter", 0, "select by exposure name (LIKE comparison)", NULL); @@ -146,4 +149,6 @@ psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-surveyName", 0, "select by survey name (LIKE comparision)", NULL); psMetadataAddS64(listrelexpArgs, PS_LIST_TAIL, "-rel_id", 0, "select by release ID", 0); + + psMetadataAddBool(listrelexpArgs, PS_LIST_TAIL, "-priority_order", 0, "order by release priority", false); psMetadataAddU64(listrelexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);