Changeset 29307
- Timestamp:
- Oct 4, 2010, 9:12:08 AM (16 years ago)
- Location:
- tags/ipp-20100823/ippTools
- Files:
-
- 16 edited
- 2 copied
-
. (modified) (1 prop)
-
share/Makefile.am (modified) (2 diffs)
-
share/chiptool_listrun.sql (modified) (1 prop)
-
share/chiptool_processedimfile.sql (modified) (1 prop)
-
share/difftool_listrun.sql (modified) (2 diffs)
-
share/difftool_listssrun.sql (copied) (copied from trunk/ippTools/share/difftool_listssrun.sql )
-
share/pstamptool_revertdependent.sql (modified) (1 prop)
-
share/pstamptool_revertjob.sql (modified) (1 prop)
-
share/pstamptool_stopdependentjob.sql (copied) (copied from trunk/ippTools/share/pstamptool_stopdependentjob.sql )
-
share/warptool_towarped.sql (modified) (1 prop)
-
src/difftool.c (modified) (9 diffs)
-
src/difftool.h (modified) (1 diff)
-
src/difftoolConfig.c (modified) (7 diffs)
-
src/pstamptool.c (modified) (1 prop)
-
src/pstamptool.h (modified) (1 prop)
-
src/pstamptoolConfig.c (modified) (1 prop)
-
src/stacktool.c (modified) (2 diffs, 1 prop)
-
src/stacktoolConfig.c (modified) (3 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20100823/ippTools
- Property svn:mergeinfo changed
/trunk/ippTools merged: 29143,29169,29171-29172,29175,29199-29200,29225,29248-29249,29283,29286,29289,29293,29299
- Property svn:mergeinfo changed
-
tags/ipp-20100823/ippTools/share/Makefile.am
r28959 r29307 138 138 difftool_inputskyfile.sql \ 139 139 difftool_listrun.sql \ 140 difftool_listssrun.sql \ 140 141 difftool_pendingcleanuprun.sql \ 141 142 difftool_pendingcleanupskyfile.sql \ … … 274 275 pstamptool_revertreq.sql \ 275 276 pstamptool_revertreq_deletejobs.sql \ 277 pstamptool_stopdependentjob.sql \ 276 278 pstamptool_updatejob.sql \ 277 279 pxadmin_create_tables.sql \ -
tags/ipp-20100823/ippTools/share/chiptool_listrun.sql
- Property svn:mergeinfo deleted
-
tags/ipp-20100823/ippTools/share/chiptool_processedimfile.sql
- Property svn:mergeinfo deleted
-
tags/ipp-20100823/ippTools/share/difftool_listrun.sql
r29138 r29307 25 25 rawInput.exp_name AS exp_name_1, 26 26 rawInput.exp_id AS exp_id_1, 27 rawInput.comment AS comment_1, 28 rawInput.dateobs AS dateobs_1, 27 29 chipInput.chip_id AS chip_id_1, 28 30 camInput.cam_id AS cam_id_1, … … 32 34 rawTemplate.exp_name AS exp_name_2, 33 35 rawTemplate.exp_id AS exp_id_2, 36 rawTemplate.comment AS comment_2, 37 rawTemplate.dateobs AS dateobs_2, 34 38 chipTemplate.chip_id AS chip_id_2, 35 39 camTemplate.cam_id AS cam_id_2, -
tags/ipp-20100823/ippTools/share/pstamptool_revertdependent.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
tags/ipp-20100823/ippTools/share/pstamptool_revertjob.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
tags/ipp-20100823/ippTools/share/warptool_towarped.sql
- Property svn:mergeinfo deleted
-
tags/ipp-20100823/ippTools/src/difftool.c
r29202 r29307 60 60 static bool tofullskyfileMode(pxConfig *config); 61 61 static bool listrunMode(pxConfig *config); 62 static bool listssrunMode(pxConfig *config); 62 63 static bool setskyfiletoupdateMode(pxConfig *config); 63 64 … … 108 109 MODECASE(DIFFTOOL_MODE_TOFULLSKYFILE, tofullskyfileMode); 109 110 MODECASE(DIFFTOOL_MODE_LISTRUN, listrunMode); 111 MODECASE(DIFFTOOL_MODE_LISTSSRUN, listssrunMode); 110 112 MODECASE(DIFFTOOL_MODE_SETSKYFILETOUPDATE, setskyfiletoupdateMode); 111 113 … … 1236 1238 PXOPT_COPY_F32(config->args, warp2Where, "-good_frac", "warpSkyfile.good_frac", ">="); 1237 1239 PXOPT_COPY_STR(config->args, stackWhere, "-stack_label", "stackRun.label", "=="); 1240 PXOPT_COPY_STR(config->args, stackWhere, "-stack_data_group", "stackRun.data_group", "=="); 1238 1241 1239 1242 PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", true, false); // required option … … 1607 1610 PXOPT_COPY_S64(config->args, selectWhere, "-warp_id", "inputWarpRun.warp_id", "=="); 1608 1611 PXOPT_COPY_S64(config->args, selectWhere, "-exp_id", "inputRawExp.exp_id", "=="); 1612 PXOPT_COPY_S64(config->args, selectWhere, "-template_exp_id", "templateRawExp.exp_id", "=="); 1609 1613 PXOPT_COPY_STR(config->args, selectWhere, "-filter", "inputRawExp.filter", "=="); 1610 1614 PXOPT_COPY_STR(config->args, selectWhere, "-obs_mode", "inputRawExp.obs_mode", "=="); … … 1645 1649 PXOPT_COPY_F32(config->args, selectWhere, "-sun_angle_min", "inputRawExp.sun_angle", ">="); 1646 1650 PXOPT_COPY_F32(config->args, selectWhere, "-sun_angle_max", "inputRawExp.sun_angle", "<"); 1647 PXOPT_COPY_STR(config->args, selectWhere, "-comment", "inputRawExp.comment", "LIKE"); 1651 PXOPT_COPY_STR(config->args, selectWhere, "-input_comment", "inputRawExp.comment", "LIKE"); 1652 PXOPT_COPY_STR(config->args, selectWhere, "-template_comment", "templateRawExp.comment", "LIKE"); 1648 1653 1649 1654 // Haversine formula for great circle distance … … 1676 1681 1677 1682 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); 1683 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); 1678 1684 PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); 1679 1685 … … 1835 1841 long numGood = 0; // Number of good rows added 1836 1842 for (long i = 0; i < results->n; i++) { 1843 if (limit && numGood >= limit) { 1844 break; 1845 } 1837 1846 psMetadata *row = results->data[i]; // Result row from query 1838 1847 … … 2862 2871 2863 2872 psMetadata *where = psMetadataAlloc(); 2864 PXOPT_COPY_S64(config->args, where, "-diff_id", "diffRun.diff_id", "=="); 2865 PXOPT_COPY_STR(config->args, where, "-tess_id", "diffRun.tess_id", "=="); 2866 PXOPT_COPY_S64(config->args, where, "-magicked", "diffRun.magicked", "=="); 2867 pxAddLabelSearchArgs (config, where, "-label", "diffRun.label", "LIKE"); 2873 PXOPT_COPY_S64(config->args, where, "-diff_id", "diffRun.diff_id", "=="); 2874 PXOPT_COPY_STR(config->args, where, "-tess_id", "diffRun.tess_id", "LIKE"); 2875 PXOPT_COPY_S64(config->args, where, "-magicked", "diffRun.magicked", "=="); 2876 PXOPT_COPY_STR(config->args, where, "-state", "diffRun.state", "=="); 2877 pxAddLabelSearchArgs (config, where, "-label", "diffRun.label", "LIKE"); 2868 2878 pxAddLabelSearchArgs (config, where, "-data_group", "diffRun.data_group", "LIKE"); 2869 2879 pxAddLabelSearchArgs (config, where, "-dist_group", "diffRun.dist_group", "LIKE"); … … 2971 2981 return true; 2972 2982 } 2983 static bool listssrunMode(pxConfig *config) 2984 { 2985 PS_ASSERT_PTR_NON_NULL(config, false); 2986 2987 psMetadata *where = psMetadataAlloc(); 2988 PXOPT_COPY_S64(config->args, where, "-diff_id", "diffRun.diff_id", "=="); 2989 PXOPT_COPY_S64(config->args, where, "-stack_id", "stackInput.stack_id", "=="); 2990 PXOPT_COPY_S64(config->args, where, "-template_stack_id", "stackTemplate.stack_id", "=="); 2991 PXOPT_COPY_STR(config->args, where, "-tess_id", "diffRun.tess_id", "LIKE"); 2992 PXOPT_COPY_STR(config->args, where, "-state", "diffRun.state", "=="); 2993 pxAddLabelSearchArgs (config, where, "-label", "diffRun.label", "LIKE"); 2994 pxAddLabelSearchArgs (config, where, "-data_group", "diffRun.data_group", "LIKE"); 2995 pxAddLabelSearchArgs (config, where, "-dist_group", "diffRun.dist_group", "LIKE"); 2996 2997 // lookup these so we don't compare to zero if they are not supplied 2998 PXOPT_LOOKUP_F64(mjd_obs_begin, config->args, "-mjd_obs_begin", false, false); 2999 PXOPT_LOOKUP_F64(mjd_obs_end, config->args, "-mjd_obs_end", false, false); 3000 3001 PXOPT_LOOKUP_BOOL(template, config->args, "-template", false); 3002 3003 if (!template) { 3004 if (mjd_obs_begin) { 3005 PXOPT_COPY_F64(config->args, where, "-mjd_obs_begin", "stackInput.mjd_obs", ">="); 3006 } 3007 if (mjd_obs_end) { 3008 PXOPT_COPY_F64(config->args, where, "-mjd_obs_end", "stackInput.mjd_obs", "<="); 3009 } 3010 PXOPT_COPY_STR(config->args, where, "-filter", "stackInputRun.filter", "LIKE"); 3011 } else { 3012 if (mjd_obs_begin) { 3013 PXOPT_COPY_F64(config->args, where, "-mjd_obs_begin", "stackTemplate.mjd_obs", ">="); 3014 } 3015 if (mjd_obs_end) { 3016 PXOPT_COPY_F64(config->args, where, "-mjd_obs_end", "stackTemplate.mjd_obs", "<="); 3017 } 3018 PXOPT_COPY_STR(config->args, where, "-filter", "stackTemplateRun.filter", "LIKE"); 3019 } 3020 3021 PXOPT_LOOKUP_BOOL(all, config->args, "-all", false); 3022 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); 3023 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); 3024 PXOPT_LOOKUP_BOOL(pstamp_order, config->args, "-pstamp_order", false); 3025 3026 psString where2 = NULL; 3027 psString query = pxDataGet("difftool_listssrun.sql"); 3028 if (!query) { 3029 psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); 3030 return false; 3031 } 3032 3033 if (psListLength(where->list)) { 3034 psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); 3035 psStringAppend(&query, " AND %s", whereClause); 3036 psFree(whereClause); 3037 } else if (where2) { 3038 psStringAppend(&query, " AND %s", where2); 3039 } else if (!all) { 3040 psError(PXTOOLS_ERR_CONFIG, true, "search parameters or -all are required"); 3041 return false; 3042 } 3043 psFree(where); 3044 3045 if (pstamp_order) { 3046 if (template) { 3047 psStringAppend(&query, " ORDER BY stackTemplate.stack_id, diff_id DESC"); 3048 } else { 3049 psStringAppend(&query, " ORDER BY stackInput.stack_id, diff_id DESC"); 3050 } 3051 } 3052 3053 // treat limit == 0 as "no limit" 3054 if (limit) { 3055 psString limitString = psDBGenerateLimitSQL(limit); 3056 psStringAppend(&query, " %s", limitString); 3057 psFree(limitString); 3058 } 3059 3060 if (!p_psDBRunQuery(config->dbh, query)) { 3061 psError(PS_ERR_UNKNOWN, false, "database error"); 3062 psFree(query); 3063 return false; 3064 } 3065 psFree(query); 3066 3067 psArray *output = p_psDBFetchResult(config->dbh); 3068 if (!output) { 3069 psErrorCode err = psErrorCodeLast(); 3070 switch (err) { 3071 case PS_ERR_DB_CLIENT: 3072 psError(PXTOOLS_ERR_SYS, false, "database error"); 3073 case PS_ERR_DB_SERVER: 3074 psError(PXTOOLS_ERR_PROG, false, "database error"); 3075 default: 3076 psError(PXTOOLS_ERR_PROG, false, "unknown error"); 3077 } 3078 3079 return false; 3080 } 3081 if (!psArrayLength(output)) { 3082 psTrace("difftool", PS_LOG_INFO, "no rows found"); 3083 psFree(output); 3084 return true; 3085 } 3086 3087 if (psArrayLength(output)) { 3088 // negative simple so the default is true 3089 if (!ippdbPrintMetadatas(stdout, output, "diffRun", !simple)) { 3090 psError(PS_ERR_UNKNOWN, false, "failed to print array"); 3091 psFree(output); 3092 return false; 3093 } 3094 } 3095 3096 psFree(output); 3097 3098 return true; 3099 } 2973 3100 // a very specfic function to queue a cleaned warpSkyfile to be updated 2974 3101 static bool setskyfiletoupdateMode(pxConfig *config) -
tags/ipp-20100823/ippTools/src/difftool.h
r28375 r29307 51 51 DIFFTOOL_MODE_TOFULLSKYFILE, 52 52 DIFFTOOL_MODE_LISTRUN, 53 DIFFTOOL_MODE_LISTSSRUN, 53 54 DIFFTOOL_MODE_SETSKYFILETOUPDATE, 54 55 } difftoolMode; -
tags/ipp-20100823/ippTools/src/difftoolConfig.c
r29202 r29307 185 185 psMetadataAddStr(listrunArgs, PS_LIST_TAIL, "-dist_group", PS_META_DUPLICATE_OK, "search by diffRun dist_group (LIKE comparison)", NULL); 186 186 psMetadataAddS16(listrunArgs, PS_LIST_TAIL, "-diff_mode", 0, "search for diff_mode", 0); 187 psMetadataAddStr(listrunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); 187 188 pxmagicAddArguments(listrunArgs); 188 189 pxspaceAddArguments(listrunArgs); … … 193 194 psMetadataAddU64(listrunArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); 194 195 psMetadataAddBool(listrunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); 196 197 198 // -listssrun 199 psMetadata *listssrunArgs = psMetadataAlloc(); 200 psMetadataAddS64(listssrunArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff ID", 0); 201 psMetadataAddStr(listssrunArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tessellation ID", NULL); 202 psMetadataAddS64(listssrunArgs , PS_LIST_TAIL, "-stack_id", 0, "search by input stack_id", 0); 203 psMetadataAddS64(listssrunArgs , PS_LIST_TAIL, "-template_stack_id",0, "search by template stack_id", 0); 204 psMetadataAddBool(listssrunArgs, PS_LIST_TAIL, "-template", 0, "apply stack selectors to template", false); 205 psMetadataAddF64(listssrunArgs, PS_LIST_TAIL, "-mjd_obs_begin", 0, "search by stack MJD-OBS (>=)", 0); 206 psMetadataAddF64(listssrunArgs, PS_LIST_TAIL, "-mjd_obs_end", 0, "search by stack MJD-OBS(<=)", 0); 207 psMetadataAddStr(listssrunArgs, PS_LIST_TAIL, "-filter", 0, "search by stack filter", NULL); 208 psMetadataAddStr(listssrunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by diffRun label (LIKE comparison)", NULL); 209 psMetadataAddStr(listssrunArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by diffRun data_group (LIKE comparison)", NULL); 210 psMetadataAddStr(listssrunArgs, PS_LIST_TAIL, "-dist_group", PS_META_DUPLICATE_OK, "search by diffRun dist_group (LIKE comparison)", NULL); 211 psMetadataAddS16(listssrunArgs, PS_LIST_TAIL, "-diff_mode", 0, "search for diff_mode", 0); 212 psMetadataAddStr(listssrunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); 213 pxmagicAddArguments(listssrunArgs); 214 pxspaceAddArguments(listssrunArgs); 215 216 psMetadataAddBool(listssrunArgs, PS_LIST_TAIL, "-pstamp_order", 0, "order results for postage stamp server", false); 217 218 psMetadataAddBool(listssrunArgs, PS_LIST_TAIL, "-all", 0, "search without arguments", false); 219 psMetadataAddU64(listssrunArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); 220 psMetadataAddBool(listssrunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); 195 221 196 222 … … 226 252 psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-comment", 0, "search by comment (LIKE)", NULL); 227 253 psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-stack_label", 0, "search by stack label", NULL); 254 psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-stack_data_group", 0, "search by stack data_group", NULL); 228 255 psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-warp_label", 0, "search by warp label", NULL); 229 256 psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group", NULL); … … 246 273 psMetadataAddS64(definewarpwarpArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); 247 274 psMetadataAddS64(definewarpwarpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0); 275 psMetadataAddS64(definewarpwarpArgs, PS_LIST_TAIL, "-template_exp_id", 0, "search by template exposure ID", 0); 248 276 psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL); 249 277 psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-distance", 0, "limit distance between input and template (deg)", NAN); … … 291 319 psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); 292 320 psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); 293 psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "search by min solar angle", NAN); 294 psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "search by max solar angle", NAN); 295 psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-comment", 0, "search by comment field (LIKE comparison)", NULL); 321 psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "search by min solar angle", NAN); 322 psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "search by max solar angle", NAN); 323 psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-input_comment", 0, "search by comment field for input exposure(LIKE comparison)", NULL); 324 psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-template_comment", 0, "search by comment field for template exposure(LIKE comparison)", NULL); 325 psMetadataAddU64(definewarpwarpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); 296 326 297 327 // -definestackstack … … 425 455 PXOPT_ADD_MODE("-advance", "", DIFFTOOL_MODE_ADVANCE, advanceArgs); 426 456 PXOPT_ADD_MODE("-diffskyfile", "", DIFFTOOL_MODE_DIFFSKYFILE, diffskyfileArgs); 427 PXOPT_ADD_MODE("-listrun", "", DIFFTOOL_MODE_LISTRUN, listrunArgs);428 457 PXOPT_ADD_MODE("-revertdiffskyfile","", DIFFTOOL_MODE_REVERTDIFFSKYFILE, revertdiffskyfileArgs); 429 458 PXOPT_ADD_MODE("-definepoprun", "", DIFFTOOL_MODE_DEFINEPOPRUN, definepoprunArgs); … … 431 460 PXOPT_ADD_MODE("-definewarpwarp", "", DIFFTOOL_MODE_DEFINEWARPWARP, definewarpwarpArgs); 432 461 PXOPT_ADD_MODE("-definestackstack", "", DIFFTOOL_MODE_DEFINESTACKSTACK, definestackstackArgs); 462 PXOPT_ADD_MODE("-listrun", "list diff runs", DIFFTOOL_MODE_LISTRUN, listrunArgs); 463 PXOPT_ADD_MODE("-listssrun", "list stack-stack diff runs", DIFFTOOL_MODE_LISTSSRUN, listssrunArgs); 433 464 PXOPT_ADD_MODE("-pendingcleanuprun", "show runs that need to be cleaned up", DIFFTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunArgs); 434 465 PXOPT_ADD_MODE("-pendingcleanupskyfile", "show runs that need to be cleaned up", DIFFTOOL_MODE_PENDINGCLEANUPSKYFILE, pendingcleanupskyfileArgs); -
tags/ipp-20100823/ippTools/src/pstamptool.c
- Property svn:mergeinfo changed (with no actual effect on merging)
-
tags/ipp-20100823/ippTools/src/pstamptool.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
tags/ipp-20100823/ippTools/src/pstamptoolConfig.c
- Property svn:mergeinfo changed (with no actual effect on merging)
-
tags/ipp-20100823/ippTools/src/stacktool.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/stacktool.c merged: 29299
r29284 r29307 1096 1096 psMetadata *where = psMetadataAlloc(); 1097 1097 PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.stack_id", "=="); 1098 PXOPT_COPY_STR(config->args, where, "-tess_id", "stackRun.tess_id", " ==");1098 PXOPT_COPY_STR(config->args, where, "-tess_id", "stackRun.tess_id", "LIKE"); 1099 1099 PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "=="); 1100 1100 PXOPT_COPY_STR(config->args, where, "-filter", "stackRun.filter", "LIKE"); … … 1102 1102 PXOPT_COPY_STR(config->args, where, "-data_group", "stackRun.data_group", "LIKE"); 1103 1103 PXOPT_COPY_S16(config->args, where, "-fault", "stackSumSkyfile.fault", "=="); 1104 PXOPT_COPY_F64(config->args, where, "-mjd_obs_begin", "stackSumSkyfile.mjd_obs", ">="); 1105 PXOPT_COPY_F64(config->args, where, "-mjd_obs_end", "stackSumSkyfile.mjd_obs", "<="); 1106 1104 1107 1105 1108 // The following three selectors are incompatible with the sql so omit them - Property svn:mergeinfo changed
-
tags/ipp-20100823/ippTools/src/stacktoolConfig.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/stacktoolConfig.c merged: 29299
r29284 r29307 186 186 psMetadata *sumskyfileArgs= psMetadataAlloc(); 187 187 psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack ID", 0); 188 psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID ", 0);188 psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID (LIKE comparison)", 0); 189 189 psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", 0); 190 190 #ifdef notdef … … 197 197 psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-data_group", 0, "search by stackRun.data_group (LIKE comparison)", NULL); 198 198 psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-filter", 0, "search by filter (LIKE comparison)", NULL); 199 psMetadataAddF64(sumskyfileArgs, PS_LIST_TAIL, "-mjd_obs_begin", 0, "search by mjd_obs (average mjd_obs of inputs <=)", NAN); 200 psMetadataAddF64(sumskyfileArgs, PS_LIST_TAIL, "-mjd_obs_end", 0, "search by mjd_obs (average mjd_obs of inputs>=)", NAN); 199 201 psMetadataAddS16(sumskyfileArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0); 200 202 psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); … … 205 207 psMetadata *sassskyfileArgs = psMetadataAlloc(); 206 208 psMetadataAddS64(sassskyfileArgs, PS_LIST_TAIL, "-sass_id", 0, "search by stack association ID", 0); 207 psMetadataAddStr(sassskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID ", 0);209 psMetadataAddStr(sassskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID (LIKE comparison)", 0); 208 210 psMetadataAddStr(sassskyfileArgs, PS_LIST_TAIL, "-projection_cell", 0, "search by projection cell", 0); 209 211 - Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
