Changeset 30732
- Timestamp:
- Feb 22, 2011, 11:59:03 AM (15 years ago)
- Location:
- tags/ipp-20110218
- Files:
-
- 20 edited
-
ippTools (modified) (1 prop)
-
ippTools/share/magicdstool_torevert_diff.sql (modified) (1 diff)
-
ippTools/src (modified) (1 prop)
-
ippTools/src/addtool.c (modified) (1 diff)
-
ippTools/src/bgtool.c (modified) (2 diffs)
-
ippTools/src/camtool.c (modified) (1 diff)
-
ippTools/src/chiptool.c (modified) (1 diff)
-
ippTools/src/chiptoolConfig.c (modified) (1 diff)
-
ippTools/src/diffphottool.c (modified) (1 diff)
-
ippTools/src/difftool.c (modified) (1 diff)
-
ippTools/src/difftoolConfig.c (modified) (1 diff)
-
ippTools/src/faketool.c (modified) (1 diff)
-
ippTools/src/magicdstool.c (modified) (1 diff, 1 prop)
-
ippTools/src/pxtools.c (modified) (2 diffs)
-
ippTools/src/pxtools.h (modified) (1 diff)
-
ippTools/src/stacktool.c (modified) (1 diff)
-
ippTools/src/staticskytool.c (modified) (1 diff)
-
ippTools/src/warptool.c (modified) (1 diff)
-
ippTools/src/warptoolConfig.c (modified) (1 diff)
-
ippconfig/recipes/nightly_science.config (modified) (1 diff, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20110218/ippTools
-
Property svn:mergeinfo
set to
/branches/czw_branch/20101203/ippTools merged eligible /branches/eam_branches/ipp-20101103/ippTools merged eligible /branches/eam_branches/ipp-20101205/ippTools merged eligible /trunk/ippTools merged eligible
-
Property svn:mergeinfo
set to
-
tags/ipp-20110218/ippTools/share/magicdstool_torevert_diff.sql
r30668 r30732 13 13 magicDSFile.recovery_path_base, 14 14 "NULL" AS cam_path_base, 15 recovery_path_base,16 15 CAST(diffRun.bothways AS SIGNED) AS bothways, 17 16 0 AS bytes, -
tags/ipp-20110218/ippTools/src
- Property svn:mergeinfo changed
/trunk/ippTools/src (added) merged: 30695,30728-30729
- Property svn:mergeinfo changed
-
tags/ipp-20110218/ippTools/src/addtool.c
r29423 r30732 324 324 // pxUpdateRun gets parameters from config->args and runs the update query 325 325 bool result = pxUpdateRun(config, where, &query, "addRun", "add_id", 326 "addProcessedExp", false );326 "addProcessedExp", false, false); 327 327 328 328 psFree(query); -
tags/ipp-20110218/ippTools/src/bgtool.c
r29671 r30732 501 501 psString query = psStringCopy("UPDATE chipBackgroundRun"); 502 502 bool result = pxUpdateRun(config, where, &query, "chipBackgroundRun", "chip_bg_id", 503 "chipBackgroundImfile", true );503 "chipBackgroundImfile", true, true); 504 504 505 505 psFree(query); … … 1471 1471 psString query = psStringCopy("UPDATE warpBackgroundRun"); 1472 1472 bool result = pxUpdateRun(config, where, &query, "warpBackgroundRun", "warp_bg_id", 1473 "warpBackgroundSkyfile", true );1473 "warpBackgroundSkyfile", true, true); 1474 1474 1475 1475 psFree(query); -
tags/ipp-20110218/ippTools/src/camtool.c
r29902 r30732 283 283 284 284 // pxUpdateRun gets parameters from config->args and updates 285 bool result = pxUpdateRun(config, where, &query, "camRun", "cam_id", "camProcessedExp", true );285 bool result = pxUpdateRun(config, where, &query, "camRun", "cam_id", "camProcessedExp", true, true); 286 286 if (!result) { 287 287 psError(psErrorCodeLast(), false, "pxUpdateRun failed"); -
tags/ipp-20110218/ippTools/src/chiptool.c
r30544 r30732 443 443 444 444 // pxUpdateRun gets parameters from config->args and updates 445 bool result = pxUpdateRun(config, where, &query, "chipRun", "chip_id", "chipProcessedImfile", true );445 bool result = pxUpdateRun(config, where, &query, "chipRun", "chip_id", "chipProcessedImfile", true, true); 446 446 if (!result) { 447 447 psError(psErrorCodeLast(), false, "pxUpdateRun failed"); -
tags/ipp-20110218/ippTools/src/chiptoolConfig.c
r30049 r30732 99 99 psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0, "set dist group", NULL); 100 100 psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0, "set note", NULL); 101 pxmagicAddArguments(updaterunArgs); 101 102 102 103 // -setimfiletoupdate -
tags/ipp-20110218/ippTools/src/diffphottool.c
r28488 r30732 228 228 229 229 // pxUpdateRun gets parameters from config->args and updates 230 bool result = pxUpdateRun(config, where, &query, "diffPhotRun", "diff_phot_id", "diffPhotSkyfile", true );230 bool result = pxUpdateRun(config, where, &query, "diffPhotRun", "diff_phot_id", "diffPhotSkyfile", true, false); 231 231 232 232 psFree(query); -
tags/ipp-20110218/ippTools/src/difftool.c
r30594 r30732 224 224 225 225 // pxUpdateRun gets parameters from config->args and updates 226 bool result = pxUpdateRun(config, where, &query, "diffRun", "diff_id", "diffSkyfile", true );226 bool result = pxUpdateRun(config, where, &query, "diffRun", "diff_id", "diffSkyfile", true, true); 227 227 228 228 psFree(query); -
tags/ipp-20110218/ippTools/src/difftoolConfig.c
r30070 r30732 73 73 psMetadataAddS16(updaterunArgs, PS_LIST_TAIL, "-set_diff_mode", 0, "specify type of difference (WW=1,WS=2,SW=3,SS=4)", 0); 74 74 psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0, "define new note", NULL); 75 pxmagicAddArguments(updaterunArgs); 75 76 76 77 // -addinputskyfile -
tags/ipp-20110218/ippTools/src/faketool.c
r27391 r30732 348 348 349 349 // pxUpdateRun gets parameters from config->args and updates 350 bool result = pxUpdateRun(config, where, &query, "fakeRun", "fake_id", "fakeProcessedImfile", true );350 bool result = pxUpdateRun(config, where, &query, "fakeRun", "fake_id", "fakeProcessedImfile", true, false); 351 351 if (!result) { 352 352 psError(psErrorCodeLast(), false, "pxUpdateRun failed"); -
tags/ipp-20110218/ippTools/src/magicdstool.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/magicdstool.c merged: 30728
r30696 r30732 1395 1395 (strcmp(state, "full") == 0) || 1396 1396 (strcmp(state, "drop") == 0) || 1397 (strcmp(state, "wait") == 0) || 1397 1398 (strcmp(state, "failed_revert") == 0) || 1398 1399 (strcmp(state, "error_cleaned") == 0) || - Property svn:mergeinfo changed
-
tags/ipp-20110218/ippTools/src/pxtools.c
r28486 r30732 278 278 279 279 // shared code for updating the various strings for a Run 280 bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString runTable, psString idColumn, psString fileTable, bool has_dist_group )280 bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString runTable, psString idColumn, psString fileTable, bool has_dist_group, bool has_magicked) 281 281 { 282 282 PS_ASSERT_PTR_NON_NULL(config, false); … … 360 360 if (fileWhere) { 361 361 psStringAppend(pQuery, "%s", fileWhere); 362 } 363 if (has_magicked) { 364 pxmagicAddWhere(config, pQuery, runTable); 362 365 } 363 366 -
tags/ipp-20110218/ippTools/src/pxtools.h
r30544 r30732 84 84 bool pxGetOptions(FILE *stream, int argc, char **argv, pxConfig *config, psMetadata *modes, psMetadata *argSets); 85 85 86 bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString runTable, psString idColumn, psString fileTable, bool has_dist_group );86 bool pxUpdateRun(pxConfig *config, psMetadata *where, psString *pQuery, psString runTable, psString idColumn, psString fileTable, bool has_dist_group, bool has_magicked); 87 87 88 88 #define PXOPT_ADD_MODE(option, comment, modeval, argset) \ -
tags/ipp-20110218/ippTools/src/stacktool.c
r30429 r30732 750 750 751 751 // pxUpdateRun gets parameters from config->args and updates 752 bool result = pxUpdateRun(config, where, &query, "stackRun", "stack_id", "stackSumSkyfile", true );752 bool result = pxUpdateRun(config, where, &query, "stackRun", "stack_id", "stackSumSkyfile", true, false); 753 753 754 754 psFree(query); -
tags/ipp-20110218/ippTools/src/staticskytool.c
r29066 r30732 360 360 361 361 // pxUpdateRun gets parameters from config->args and updates 362 bool result = pxUpdateRun(config, where, &query, "staticskyRun", "sky_id", "staticskyResult", true );362 bool result = pxUpdateRun(config, where, &query, "staticskyRun", "sky_id", "staticskyResult", true, false); 363 363 psFree(query); 364 364 psFree(where); -
tags/ipp-20110218/ippTools/src/warptool.c
r30556 r30732 435 435 436 436 // pxUpdateRun gets parameters from config->args and updates 437 bool result = pxUpdateRun(config, where, &query, "warpRun", "warp_id", "warpSkyfile", true );437 bool result = pxUpdateRun(config, where, &query, "warpRun", "warp_id", "warpSkyfile", true, true); 438 438 439 439 psFree(query); -
tags/ipp-20110218/ippTools/src/warptoolConfig.c
r29416 r30732 149 149 psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define new dist_group", NULL); 150 150 psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0, "define new note", NULL); 151 pxmagicAddArguments(updaterunArgs); 151 152 152 153 // -exp -
tags/ipp-20110218/ippconfig/recipes/nightly_science.config
- Property svn:mergeinfo set to
r30470 r30732 2 2 CLEAN_MODES METADATA 3 3 MODE STR CHIP 4 COMMAND STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ 4 COMMAND STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ -destreaked 5 5 RETENTION_TIME U16 21 6 6 END 7 7 CLEAN_MODES METADATA 8 8 MODE STR WARP 9 COMMAND STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ 9 COMMAND STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ -destreaked 10 10 RETENTION_TIME U16 7 11 11 END 12 12 CLEAN_MODES METADATA 13 13 MODE STR DIFF 14 COMMAND STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ 14 COMMAND STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ -destreaked 15 15 RETENTION_TIME S16 21 16 16 END
Note:
See TracChangeset
for help on using the changeset viewer.
