Changeset 31956
- Timestamp:
- Aug 1, 2011, 11:26:32 AM (15 years ago)
- Location:
- tags/ipp-20110622/ippTools/src
- Files:
-
- 4 edited
-
chiptool.c (modified) (2 diffs, 1 prop)
-
chiptoolConfig.c (modified) (1 diff, 1 prop)
-
warptool.c (modified) (4 diffs, 1 prop)
-
warptoolConfig.c (modified) (2 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20110622/ippTools/src/chiptool.c
- Property svn:mergeinfo set to
r30907 r31956 743 743 faulted = false; 744 744 } 745 PXOPT_LOOKUP_BOOL(pstamp_order, config->args, "-pstamp_order", false); 745 746 746 747 psMetadata *where = psMetadataAlloc(); … … 787 788 // don't list faulted rows 788 789 psStringAppend(&query, " %s", "AND chipProcessedImfile.fault = 0"); 790 } 791 792 if (pstamp_order) { 793 // put runs in order of exposure id with newest chip Runs first 794 // The postage stamp parser depends on this behavior 795 psStringAppend(&query, "\nORDER by exp_id, chip_id DESC"); 789 796 } 790 797 -
tags/ipp-20110622/ippTools/src/chiptoolConfig.c
- Property svn:mergeinfo set to
r30907 r31956 210 210 psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by chipRun data_group (LIKE comparison)", NULL); 211 211 pxmagicAddArguments(processedimfileArgs); 212 psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-pstamp_order", 0, "order results for postage stamp server", false); 212 213 213 214 psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); -
tags/ipp-20110622/ippTools/src/warptool.c
- Property svn:mergeinfo set to
r30729 r31956 1382 1382 pxAddLabelSearchArgs (config, where, "-data_group", "warpRun.data_group", "LIKE"); 1383 1383 1384 PXOPT_LOOKUP_BOOL(pstamp_order, config->args, "-pstamp_order", false); 1384 1385 PXOPT_LOOKUP_BOOL(all, config->args, "-all", false); 1385 1386 … … 1423 1424 } 1424 1425 psFree(where); 1426 1427 if (pstamp_order) { 1428 // put runs in order of exposure id with newest warp Runs first 1429 // The postage stamp parser depends on this behavior 1430 psStringAppend(&query, "\nORDER by exp_id, warp_id DESC"); 1431 } 1425 1432 1426 1433 // treat limit == 0 as "no limit" … … 2094 2101 2095 2102 // warp_id, skycell_id, fault are required 2096 PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);2097 PXOPT_LOOKUP_STR(skycell_id, config->args, "-skycell_id", true, false);2098 PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);2099 2103 PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); 2100 2104 2101 2105 if (!state) { 2102 psString query = pxDataGet("warptool_updateskyfile.sql"); 2103 2104 if (!p_psDBRunQueryF(config->dbh, query, fault, warp_id, skycell_id)) { 2105 psError(PS_ERR_UNKNOWN, false, "database error"); 2106 psMetadata *where = psMetadataAlloc(); 2107 PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); 2108 PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "=="); 2109 if (psListLength(where->list) == 0) { 2110 // this won't happen because warptoolConfig requires these arguments 2111 psError(PS_ERR_UNKNOWN, true, "search parameters are required"); 2112 psFree(where); 2106 2113 return false; 2107 2114 } 2108 psFree(query); 2115 2116 PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false); 2117 PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false); 2118 2119 if (!pxSetFaultCode(config->dbh, "warpSkyfile", where, fault, quality)) { 2120 psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); 2121 psFree(where); 2122 return false; 2123 } 2124 psFree(where); 2109 2125 } 2110 2126 else { … … 2458 2474 2459 2475 if (pstamp_order) { 2460 // put runs in order of exposure id with newest chip Runs first2476 // put runs in order of exposure id with newest warp Runs first 2461 2477 // The postage stamp parser depends on this behavior 2462 2478 psStringAppend(&query, "\nORDER by exp_id, warp_id DESC"); 2463 2479 } 2464 2465 2480 2466 2481 // treat limit == 0 as "no limit" -
tags/ipp-20110622/ippTools/src/warptoolConfig.c
- Property svn:mergeinfo set to
r30733 r31956 258 258 // add arguments for spatial search 259 259 pxspaceAddArguments(warpedArgs); 260 psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-pstamp_order", 0, "order results for postage stamp server", false); 260 261 261 262 psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-all", 0, "search without arguments", false); … … 398 399 // -updateskyfile 399 400 psMetadata *updateskyfileArgs = psMetadataAlloc(); 400 psMetadataAddS64(updateskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "warptool ID to update ", 0);401 psMetadataAddStr(updateskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "skycell ID to update ", NULL);401 psMetadataAddS64(updateskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "warptool ID to update (required)", 0); 402 psMetadataAddStr(updateskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "skycell ID to update (required)", NULL); 402 403 psMetadataAddS16(updateskyfileArgs, PS_LIST_TAIL, "-fault", 0, "new fault code", 0); 404 psMetadataAddS16(updateskyfileArgs, PS_LIST_TAIL, "-set_quality", 0,"new quality value", 0); 403 405 psMetadataAddStr(updateskyfileArgs, PS_LIST_TAIL, "-set_state", 0, "set state", 0); 404 406
Note:
See TracChangeset
for help on using the changeset viewer.
