Changeset 35048 for trunk/ippTools
- Timestamp:
- Jan 24, 2013, 4:54:58 PM (13 years ago)
- Location:
- trunk/ippTools
- Files:
-
- 4 edited
-
share/pxadmin_create_tables.sql (modified) (2 diffs)
-
share/releasetool_listrelexp.sql (modified) (3 diffs)
-
src/releasetool.c (modified) (12 diffs)
-
src/releasetoolConfig.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippTools/share/pxadmin_create_tables.sql
r34912 r35048 2161 2161 surveyID INT(8), 2162 2162 releaseName VARCHAR(64), 2163 state VARCHAR(16), -- active, pending archivedrop2163 relase_state VARCHAR(16), -- active, pending, archive, drop 2164 2164 dataRelease INT(8), -- PSPS dataRelease 2165 priority INT(8), 2165 2166 PRIMARY KEY(rel_id), 2166 2167 KEY(releaseName), 2167 2168 KEY(state), 2169 KEY(priority), 2168 2170 FOREIGN KEY(surveyID) REFERENCES survey(surveyID) 2169 2171 ) ENGINE=Innodb DEFAULT CHARSET=latin1; … … 2191 2193 ) ENGINE=innodb DEFAULT CHARSET=latin1; 2192 2194 2193 2194 -- This comment line is here to avoid empty query error. 2195 CREATE TABLE relStack ( 2196 relstack_id BIGINT AUTO_INCREMENT, 2197 rel_id INT(8), 2198 skycal_id BIGINT, -- id of the sky calibration run that supplied the calibration 2199 -- for this release. We get back to stack from here 2200 skycell_id varchar(64), 2201 tess_id varchar(64), 2202 state VARCHAR(16), -- released, pending, archive, drop 2203 flags INT UNSIGNED, 2204 stack_type VARCHAR(16), -- nightly, deep, reference 2205 zpt_obs FLOAT, -- calibrated zero point for this release of this skycell 2206 zpt_stdev FLOAT, 2207 fwhm_major FLOAT, -- seeing as measured by staticsky 2208 path_base VARCHAR(255), -- path_base of any supporting files, 2209 registered DATETIME, 2210 time_stamp DATETIME, 2211 PRIMARY KEY (relstack_id), 2212 KEY (tess_id, skycell_id), 2213 KEY (rel_id, tess_id, skycell_id), 2214 FOREIGN KEY(rel_id) REFERENCES ippRelease(rel_id), 2215 FOREIGN KEY(skycal_id) REFERENCES skycalRun(skycal_id) 2216 ) ENGINE=innodb DEFAULT CHARSET=latin1; 2217 2218 2219 2220 -- These comment lines are here to avoid an empty query error. 2195 2221 -- Another way to avoid that problem is to omit the semicolon above but I think that is untidy. -
trunk/ippTools/share/releasetool_listrelexp.sql
r35041 r35048 1 1 SELECT 2 2 relexp_id, 3 releaseName,4 3 relExp.state, 5 rel_id, 4 ippRelease.releaseName, 5 ippRelease.release_state, 6 ippRelease.rel_id, 7 ippRelease.priority, 6 8 survey.surveyName, 7 exp_name,9 rawExp.exp_name, 8 10 relExp.flags, 9 11 relExp.zpt_obs, … … 12 14 relExp.registered, 13 15 relExp.time_stamp, 14 exp_id,15 chip_id,16 relExp.exp_id, 17 relExp.chip_id, 16 18 chipRun.state as chip_state, 17 cam_id,19 relExp.cam_id, 18 20 camRun.state as cam_state, 19 21 camProcessedExp.path_base as cam_path_base, 20 22 camProcessedExp.fwhm_major, 21 warp _id,23 warpRun.warp_id, 22 24 warpRun.state as warp_state, 23 25 rawExp.filter, … … 25 27 TRUNCATE(DEGREES(rawExp.ra), 4) AS radeg, 26 28 TRUNCATE(DEGREES(rawExp.decl), 4) AS decdeg, 27 rawExp.object,28 29 rawExp.comment 29 30 FROM relExp -
trunk/ippTools/src/releasetool.c
r35041 r35048 119 119 psFree(whereClause); 120 120 } else { 121 // The list of surveys is short there is no need to require parameters 122 #ifdef notdef 123 psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required\n"); 124 psFree(where); 125 return false; 126 #endif 121 // carry on The list of surveys is short there is no need to require parameters 127 122 } 128 123 … … 167 162 PS_ASSERT_PTR_NON_NULL(config, false); 168 163 164 PXOPT_LOOKUP_S32(surveyID, config->args, "-set_surveyID", true, false); 169 165 PXOPT_LOOKUP_STR(releaseName, config->args, "-set_releaseName", true, false); 170 PXOPT_LOOKUP_S 32(surveyID, config->args, "-set_surveyID",true, false);166 PXOPT_LOOKUP_STR(release_state, config->args, "-set_release_state", true, false); 171 167 PXOPT_LOOKUP_S32(dataRelease, config->args, "-set_dataRelease", false, false); 172 PXOPT_LOOKUP_S TR(state, config->args, "-set_state", true, false);168 PXOPT_LOOKUP_S32(priority, config->args, "-set_priority", false, false); 173 169 174 170 if (!ippReleaseInsert(config->dbh, … … 176 172 surveyID, 177 173 releaseName, 178 state, 179 dataRelease 174 release_state, 175 dataRelease, 176 priority 180 177 )) { 181 178 psError(PS_ERR_UNKNOWN, false, "failed to insert ippRelease"); … … 197 194 return false; 198 195 } 199 PXOPT_LOOKUP_STR( state, config->args, "-set_state", true, false);196 PXOPT_LOOKUP_STR(release_state, config->args, "-set_release_state", true, false); 200 197 201 198 psMetadata *where = psMetadataAlloc(); … … 205 202 206 203 psString query = NULL; 207 psStringAppend(&query, "UPDATE ippRelease SET state = '%s'",state);204 psStringAppend(&query, "UPDATE ippRelease SET release_state = '%s'", release_state); 208 205 209 206 psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); … … 236 233 PXOPT_COPY_STR(config->args, where, "-surveyName", "surveyName", "LIKE"); 237 234 PXOPT_COPY_STR(config->args, where, "-releaseName", "releaseName", "LIKE"); 238 PXOPT_COPY_STR(config->args, where, "- state", "state", "==");235 PXOPT_COPY_STR(config->args, where, "-release_state", "release_state", "=="); 239 236 PXOPT_COPY_S32(config->args, where, "-rel_id", "rel_id", "=="); 240 237 … … 251 248 } else { 252 249 // The list of releases is short there is no need to require parameters 253 #ifdef notyet250 #ifdef notyet 254 251 psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required\n"); 255 252 psFree(where); 256 253 return false; 257 #endif254 #endif 258 255 } 259 256 … … 294 291 } 295 292 296 static bool definerelexpMode(pxConfig *config) 297 { 298 PS_ASSERT_PTR_NON_NULL(config, NULL); 299 300 psMetadata *where = psMetadataAlloc(); 301 302 PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "=="); 303 PXOPT_COPY_STR(config->args, where, "-data_group", "camRun.data_group", "=="); 304 PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); 305 306 // Insure that at least one of the camRun selectors is supplied 307 if (!psListLength(where->list)) { 308 psFree(where); 309 psError(PXTOOLS_ERR_CONFIG, false, "at least one of -label, -data_group, or -cam_id is required"); 310 return false; 311 } 312 313 PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); 314 PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "=="); 315 316 // insure that at least one of these is supplied to select the release 317 PXOPT_LOOKUP_S64(rel_id, config->args, "-rel_id", false, false); 318 PXOPT_LOOKUP_STR(releaseName, config->args, "-releaseName", false, false); 319 if (!rel_id && !releaseName) { 320 psError(PXTOOLS_ERR_CONFIG, true, "either -rel_id or -releaseName is required"); 321 return false; 322 } 323 324 // limit query to the target release. (Note: this will select nothing of releaseName and rel_id don't match) 325 // note: we add these after above to insure that search args are supplied 326 PXOPT_COPY_STR(config->args, where, "-releaseName", "ippRelease.releaseName", "=="); 327 PXOPT_COPY_S32(config->args, where, "-rel_id", "ippRelease.rel_id", "=="); 328 329 330 PXOPT_LOOKUP_STR(state, config->args, "-set_state", true, false); 331 PXOPT_LOOKUP_U32(flags, config->args, "-set_flags", false, false); 332 PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false); 333 334 PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); 335 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); 336 337 // find the parameters of all the exposures that we want to add to the release 338 psString query = pxDataGet("releasetool_definerelexp.sql"); 339 if (!query) { 340 psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); 341 psFree(where); 342 return false; 343 } 344 345 psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); 346 psStringAppend(&query, " AND %s", whereClause); 347 psFree(whereClause); 348 293 static bool definerelexpMode(pxConfig *config) 294 { 295 PS_ASSERT_PTR_NON_NULL(config, NULL); 296 297 psMetadata *where = psMetadataAlloc(); 298 299 PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "=="); 300 PXOPT_COPY_STR(config->args, where, "-data_group", "camRun.data_group", "=="); 301 PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); 302 303 // Insure that at least one of the camRun selectors is supplied 304 if (!psListLength(where->list)) { 349 305 psFree(where); 350 351 if (!p_psDBRunQuery(config->dbh, query)) { 352 psError(PS_ERR_UNKNOWN, false, "database error"); 353 psFree(query); 354 return false; 355 } 306 psError(PXTOOLS_ERR_CONFIG, false, "at least one of -label, -data_group, or -cam_id is required"); 307 return false; 308 } 309 310 PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); 311 PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "=="); 312 313 // insure that at least one of these is supplied to select the release 314 PXOPT_LOOKUP_S64(rel_id, config->args, "-rel_id", false, false); 315 PXOPT_LOOKUP_STR(releaseName, config->args, "-releaseName", false, false); 316 if (!rel_id && !releaseName) { 317 psError(PXTOOLS_ERR_CONFIG, true, "either -rel_id or -releaseName is required"); 318 return false; 319 } 320 321 // limit query to the target release. (Note: this will select nothing of releaseName and rel_id don't match) 322 // note: we add these after above to insure that search args are supplied 323 PXOPT_COPY_STR(config->args, where, "-releaseName", "ippRelease.releaseName", "=="); 324 PXOPT_COPY_S32(config->args, where, "-rel_id", "ippRelease.rel_id", "=="); 325 326 327 PXOPT_LOOKUP_STR(state, config->args, "-set_state", true, false); 328 PXOPT_LOOKUP_U32(flags, config->args, "-set_flags", false, false); 329 PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false); 330 331 PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); 332 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); 333 334 // find the parameters of all the exposures that we want to add to the release 335 psString query = pxDataGet("releasetool_definerelexp.sql"); 336 if (!query) { 337 psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); 338 psFree(where); 339 return false; 340 } 341 342 psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); 343 psStringAppend(&query, " AND %s", whereClause); 344 psFree(whereClause); 345 346 psFree(where); 347 348 if (!p_psDBRunQuery(config->dbh, query)) { 349 psError(PS_ERR_UNKNOWN, false, "database error"); 356 350 psFree(query); 357 358 psArray *output = p_psDBFetchResult(config->dbh); 359 if (!output) { 360 psError(PS_ERR_UNKNOWN, false, "database error"); 361 return false; 362 } 363 if (!psArrayLength(output)) { 364 psTrace("releasetool", PS_LOG_INFO, "no rows found"); 351 return false; 352 } 353 psFree(query); 354 355 psArray *output = p_psDBFetchResult(config->dbh); 356 if (!output) { 357 psError(PS_ERR_UNKNOWN, false, "database error"); 358 return false; 359 } 360 if (!psArrayLength(output)) { 361 psTrace("releasetool", PS_LOG_INFO, "no rows found"); 362 psFree(output); 363 return true; 364 } 365 366 if (pretend) { 367 // negative simple so the default is true 368 if (!ippdbPrintMetadatas(stdout, output, "chipRun", !simple)) { 369 psError(PS_ERR_UNKNOWN, false, "failed to print array"); 365 370 psFree(output); 366 return true; 367 } 368 369 if (pretend) { 370 // negative simple so the default is true 371 if (!ippdbPrintMetadatas(stdout, output, "chipRun", !simple)) { 372 psError(PS_ERR_UNKNOWN, false, "failed to print array"); 373 psFree(output); 374 return false; 371 return false; 372 } 373 psFree(output); 374 return true; 375 } 376 377 if (!psDBTransaction(config->dbh)) { 378 psError(PS_ERR_UNKNOWN, false, "database error"); 379 psFree(output); 380 return false; 381 } 382 383 psTime *now = psTimeGetNow(PS_TIME_TAI); 384 // loop over our list of exposures 385 for (long i = 0; i < psArrayLength(output); i++) { 386 psMetadata *md = output->data[i]; 387 388 bool status = true; 389 psS32 rel_id = psMetadataLookupS32(&status, md, "rel_id"); 390 psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id"); 391 psS64 chip_id = psMetadataLookupS64(&status, md, "chip_id"); 392 psS64 cam_id = psMetadataLookupS64(&status, md, "cam_id"); 393 psF32 zpt_obs = psMetadataLookupF32(&status, md, "zpt_obs"); 394 psF32 zpt_stdev = psMetadataLookupF32(&status, md, "zpt_stdev"); 395 396 if (!relExpInsert(config->dbh, 397 0, // relexp_id (auto increment) 398 rel_id, 399 exp_id, 400 chip_id, 401 cam_id, 402 state, 403 flags, 404 zpt_obs, 405 zpt_stdev, 406 path_base, 407 now, // registered 408 now // time_stamp 409 )) { 410 if (!psDBRollback(config->dbh)) { 411 psError(PS_ERR_UNKNOWN, false, "database error"); 375 412 } 413 psError(PS_ERR_UNKNOWN, false, 414 "failed to trying to insert relExp for cam_id %" PRId64, cam_id); 376 415 psFree(output); 377 return true; 378 } 379 380 if (!psDBTransaction(config->dbh)) { 381 psError(PS_ERR_UNKNOWN, false, "database error"); 382 psFree(output); 383 return false; 384 } 385 386 psTime *now = psTimeGetNow(PS_TIME_TAI); 387 // loop over our list of exposures 388 for (long i = 0; i < psArrayLength(output); i++) { 389 psMetadata *md = output->data[i]; 390 391 bool status = true; 392 psS32 rel_id = psMetadataLookupS32(&status, md, "rel_id"); 393 psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id"); 394 psS64 chip_id = psMetadataLookupS64(&status, md, "chip_id"); 395 psS64 cam_id = psMetadataLookupS64(&status, md, "cam_id"); 396 psF32 zpt_obs = psMetadataLookupF32(&status, md, "zpt_obs"); 397 psF32 zpt_stdev = psMetadataLookupF32(&status, md, "zpt_stdev"); 398 399 if (!relExpInsert(config->dbh, 400 0, // relexp_id (auto increment) 401 rel_id, 402 exp_id, 403 chip_id, 404 cam_id, 405 state, 406 flags, 407 zpt_obs, 408 zpt_stdev, 409 path_base, 410 now, // registered 411 now // time_stamp 412 )) { 413 if (!psDBRollback(config->dbh)) { 414 psError(PS_ERR_UNKNOWN, false, "database error"); 415 } 416 psError(PS_ERR_UNKNOWN, false, 417 "failed to trying to insert relExp for cam_id %" PRId64, cam_id); 418 psFree(output); 419 psFree(now); 420 return false; 421 } 422 } 423 psFree(output); 424 425 if (!psDBCommit(config->dbh)) { 426 psError(PS_ERR_UNKNOWN, false, "database error"); 427 return false; 428 } 429 430 return true; 431 } 432 433 static bool updaterelexpMode(pxConfig *config) 434 { 435 psError(PS_ERR_UNKNOWN, true, "not yet implemented"); 436 return false; 437 } 416 psFree(now); 417 return false; 418 } 419 } 420 psFree(output); 421 422 if (!psDBCommit(config->dbh)) { 423 psError(PS_ERR_UNKNOWN, false, "database error"); 424 return false; 425 } 426 427 return true; 428 } 429 430 static bool updaterelexpMode(pxConfig *config) 431 { 432 psError(PS_ERR_UNKNOWN, true, "not yet implemented"); 433 return false; 434 } 438 435 439 436 static bool listrelexpMode(pxConfig *config) … … 444 441 445 442 PXOPT_COPY_STR(config->args, where, "-releaseName", "ippRelease.releaseName", "LIKE"); 446 PXOPT_COPY_STR(config->args, where, "-state", "ippRelease.state", "=="); 443 pxAddLabelSearchArgs(config, where, "-release_state","ippRelease.state", "=="); 444 PXOPT_COPY_STR(config->args, where, "-state", "relExp.state", "=="); 447 445 PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "LIKE"); 448 446 PXOPT_COPY_TIME(config->args, where, "-dateobs_begin","rawExp.dateobs", ">="); … … 462 460 PXOPT_COPY_S32(config->args, where, "-rel_id", "relExp.rel_id", "=="); 463 461 462 PXOPT_LOOKUP_BOOL(priority_order, config->args, "-priority_order", false); 463 464 464 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); 465 465 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); … … 494 494 } 495 495 496 if (priority_order) { 497 psStringAppend(&query, "\nAND priority > 0 order by exp_id, priority"); 498 } 499 496 500 if (limit) { 497 501 psString limitString = psDBGenerateLimitSQL(limit); … … 530 534 } 531 535 532 #ifdef notyet533 static bool defineskycellsMode(pxConfig *config)534 {535 PS_ASSERT_PTR_NON_NULL(config, NULL);536 537 PXOPT_LOOKUP_STR(inputFile, config->args, "-input", true, false);538 539 unsigned int numBad = 0;540 psMetadata *skycells = psMetadataConfigRead(NULL, &numBad, inputFile, false);541 if (!skycells || numBad > 0) {542 psError(PXTOOLS_ERR_UNKNOWN, false, "failed to read %s", inputFile);543 return false;544 }545 546 if (!psDBTransaction(config->dbh)) {547 psError(PS_ERR_UNKNOWN, false, "database error");548 return false;549 }550 551 psMetadataIterator *iter = psMetadataIteratorAlloc(skycells, PS_LIST_HEAD, NULL);552 553 psMetadataItem *item;554 int numSkycells = 0;555 while ((item = psMetadataGetAndIncrement(iter))) {556 if (item->type != PS_DATA_METADATA) {557 psError(PS_ERR_UNKNOWN, true, "unexpected item in metadata type: %d", item->type);558 return false;559 }560 psMetadata *md = item->data.md;561 psString tess_id = psMetadataLookupStr(NULL, md, "tess_id");562 psString skycell_id = psMetadataLookupStr(NULL, md, "skycell_id");563 564 skycellRow *skycell = skycellObjectFromMetadata(md);565 if (!skycell) {566 psError(PS_ERR_UNKNOWN, false, "failed to create skycellRow from Metadata");567 return false;568 }569 570 numSkycells++;571 if (!skycellInsertObject(config->dbh, skycell)) {572 psError(PS_ERR_UNKNOWN, false, "failed to insert skycell %s %s", tess_id, skycell_id);573 return false;574 }575 }576 psFree(iter);577 psFree(skycells);578 579 if (!psDBCommit(config->dbh)) {580 psError(PS_ERR_UNKNOWN, false, "database error");581 return false;582 }583 584 psLogMsg("releasetool", PS_LOG_INFO, "%d skycells added", numSkycells);585 586 return true;587 }588 static bool listMode(pxConfig *config)589 {590 PS_ASSERT_PTR_NON_NULL(config, NULL);591 592 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);593 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);594 psMetadata *where = psMetadataAlloc();595 596 PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell.skycell_id", "LIKE");597 PXOPT_COPY_STR(config->args, where, "-tess_id", "skycell.tess_id", "LIKE");598 pxskycellAddWhere(config, where);599 600 psString query = pxDataGet("releasetool_list.sql");601 if (!query) {602 psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");603 return false;604 }605 606 if (!psListLength(where->list)) {607 psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required\n");608 psFree(where);609 return false;610 }611 psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);612 psStringAppend(&query, " WHERE %s", whereClause);613 psFree(whereClause);614 615 if (limit) {616 psString limitString = psDBGenerateLimitSQL(limit);617 psStringAppend(&query, " %s", limitString);618 psFree(limitString);619 }620 621 if (!p_psDBRunQuery(config->dbh, query)) {622 psError(PS_ERR_UNKNOWN, false, "database error");623 psFree(query);624 return false;625 }626 psFree(query);627 628 psArray *output = p_psDBFetchResult(config->dbh);629 if (!output) {630 psError(PS_ERR_UNKNOWN, false, "database error");631 return false;632 }633 634 if (!psArrayLength(output)) {635 psTrace("releasetool", PS_LOG_INFO, "no rows found");636 psFree(output);637 return true;638 }639 640 if (!ippdbPrintMetadatas(stdout, output, "skycell", !simple)) {641 psError(PS_ERR_UNKNOWN, false, "failed to print array");642 psFree(output);643 return false;644 }645 646 psFree(output);647 648 649 return true;650 }651 652 #endif -
trunk/ippTools/src/releasetoolConfig.c
r35041 r35048 62 62 psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_releaseName", 0, "define release name (required)", NULL); 63 63 psMetadataAddS32(definereleaseArgs, PS_LIST_TAIL, "-set_dataRelease", 0, "define dataRelease", -1); 64 psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_state", 0, "define survey state", NULL); 64 psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_release_state", 0, "define release state", NULL); 65 psMetadataAddS32(definereleaseArgs, PS_LIST_TAIL, "-set_priority", 0, "define release priority", -1); 65 66 66 67 // -uptdaterelease … … 71 72 psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-rel_id", 0, "select by release ID", 0); 72 73 73 // Only support changing state for now 74 psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_state", 0, "define new survey state(required)", NULL); 74 // Only support changing state and priority for now 75 psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_release_state", 0, "define new release state(required)", NULL); 76 psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_priority", 0, "define new release priority", 0); 75 77 76 78 // psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_surveyID", 0, "define surveyID (required)", 0); … … 83 85 psMetadataAddStr(listreleaseArgs, PS_LIST_TAIL, "-surveyName", 0, "select by survey name (LIKE comparision)", NULL); 84 86 psMetadataAddStr(listreleaseArgs, PS_LIST_TAIL, "-releaseName", 0, "select by release name (LIKE comparision)", NULL); 85 psMetadataAddStr(listreleaseArgs, PS_LIST_TAIL, "- state",0, "select by release state", NULL);87 psMetadataAddStr(listreleaseArgs, PS_LIST_TAIL, "-release_state", 0, "select by release state", NULL); 86 88 psMetadataAddS32(listreleaseArgs, PS_LIST_TAIL, "-rel_id", 0, "select by release ID", 0); 87 89 … … 92 94 psMetadata *definerelexpArgs = psMetadataAlloc(); 93 95 94 // toset the target release96 // set the target release 95 97 psMetadataAddStr(definerelexpArgs, PS_LIST_TAIL, "-releaseName", 0, "define release name", NULL); 96 98 psMetadataAddS32(definerelexpArgs, PS_LIST_TAIL, "-rel_id", 0, "define release ID", 0); 97 99 98 // toselect the processing100 // select the processing 99 101 psMetadataAddS64(definerelexpArgs, PS_LIST_TAIL, "-cam_id", 0, "select by cam ID", 0); 100 102 psMetadataAddStr(definerelexpArgs, PS_LIST_TAIL, "-label", 0, "select by camRun.label", NULL); 101 103 psMetadataAddStr(definerelexpArgs, PS_LIST_TAIL, "-data_group", 0, "select by camRun.data_group", NULL); 102 104 103 // toselect a specific exposure from the "processing"105 // select a specific exposure from the "processing" 104 106 psMetadataAddS64(definerelexpArgs, PS_LIST_TAIL, "-exp_id", 0, "select by exposure ID", 0); 105 107 psMetadataAddStr(definerelexpArgs, PS_LIST_TAIL, "-exp_name", 0, "select by exposure name", NULL); … … 122 124 psMetadata *listrelexpArgs = psMetadataAlloc(); 123 125 psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-releaseName", 0, "select by release name (LIKE comparision)", NULL); 124 psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-state", 0, "select by release state", NULL); 126 psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-release_state", PS_META_DUPLICATE_OK, "select by release state", NULL); 127 psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-state", 0, "select by released exposure state", NULL); 125 128 126 129 psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-filter", 0, "select by exposure name (LIKE comparison)", NULL); … … 146 149 psMetadataAddStr(listrelexpArgs, PS_LIST_TAIL, "-surveyName", 0, "select by survey name (LIKE comparision)", NULL); 147 150 psMetadataAddS64(listrelexpArgs, PS_LIST_TAIL, "-rel_id", 0, "select by release ID", 0); 151 152 psMetadataAddBool(listrelexpArgs, PS_LIST_TAIL, "-priority_order", 0, "order by release priority", false); 148 153 149 154 psMetadataAddU64(listrelexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
Note:
See TracChangeset
for help on using the changeset viewer.
