Changeset 20111
- Timestamp:
- Oct 13, 2008, 2:00:30 PM (18 years ago)
- File:
-
- 1 edited
-
trunk/pstamp/src/pstamprequest.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/pstamp/src/pstamprequest.c
r18743 r20111 17 17 "PROJECT", 18 18 "JOB_TYPE", 19 "REQ_TYPE", // byid, byexp, bycoord19 "REQ_TYPE", // byid, byexp, bydiff, bycoord 20 20 "ID", // db id, exposure name, n/a 21 21 "CLASS_ID", … … 178 178 } 179 179 180 #define PRINT_MULTIPLE_STYLE_ERROR \ 181 fprintf(stderr, "one of -bycoord -byid -byexp -bydiff may be specified\n") 182 180 183 static psrOptions *parseArguments(int argc, char *argv[], int *pExitStatus) 181 184 { … … 271 274 if ((argnum = psArgumentGet(argc, argv, "-byid"))) { 272 275 if (gotStyle) { 273 fprintf(stderr, "only one of -bycoord -byid -byexp may be specified\n");276 PRINT_MULTIPLE_STYLE_ERROR; 274 277 usage(PS_EXIT_DATA_ERROR); 275 278 } … … 282 285 if ((argnum = psArgumentGet(argc, argv, "-byexp"))) { 283 286 if (gotStyle) { 284 fprintf(stderr, "only one of -bycoord -byid -byexp may be specified\n");287 PRINT_MULTIPLE_STYLE_ERROR; 285 288 usage(PS_EXIT_DATA_ERROR); 286 289 } … … 290 293 doByExp(argnum, &argc, argv, options); 291 294 } 295 296 if ((argnum = psArgumentGet(argc, argv, "-bydiff"))) { 297 if (gotStyle) { 298 PRINT_MULTIPLE_STYLE_ERROR; 299 usage(PS_EXIT_DATA_ERROR); 300 } 301 gotStyle = true; 302 psMetadataAddStr(md, PS_LIST_TAIL, "REQ_TYPE", PS_META_REPLACE, "", 1+argv[argnum]); 303 psArgumentRemove(argnum, &argc, argv); 304 // It looks like byExp and byId are identical, so reuse them 305 doByExp(argnum, &argc, argv, options); 306 } 307 292 308 if (!gotStyle) { 293 fprintf(stderr, "one of -bycoord -byid -byexp must be specified\n"); 294 usage(PS_EXIT_DATA_ERROR); 295 } 309 fprintf(stderr, "one of -bycoord -byid -byexp -bydiff must be specified\n"); 310 usage(PS_EXIT_DATA_ERROR); 311 } 312 296 313 if ((argnum = psArgumentGet(argc, argv, "-mjd_min"))) { 297 314 psArgumentRemove(argnum, &argc, argv);
Note:
See TracChangeset
for help on using the changeset viewer.
