- Timestamp:
- May 3, 2010, 8:50:52 AM (16 years ago)
- Location:
- branches/simtest_nebulous_branches
- Files:
-
- 3 edited
-
. (modified) (1 prop)
-
ippTools/src (modified) (1 prop)
-
ippTools/src/pztool.c (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/simtest_nebulous_branches
- Property svn:mergeinfo changed
-
branches/simtest_nebulous_branches/ippTools/src
- Property svn:ignore
-
old new 1 *.la 2 *.lo 1 3 .deps 2 4 .gdb_history … … 4 6 Makefile 5 7 Makefile.in 8 addtool 9 caltool 10 camtool 11 chiptool 6 12 config.h 7 13 config.h.in 8 stamp-h1 9 *.la 10 *.lo 14 detselect 15 dettool 16 difftool 17 disttool 18 dqstatstool 19 faketool 20 flatcorr 21 guidetool 22 magicdstool 23 magictool 24 pstamptool 25 pubtool 26 pxadmin 27 pxdata.c 28 pxinject 11 29 pxtoolsErrorCodes.c 12 30 pxtoolsErrorCodes.h 13 pxadmin14 pxinject15 pztool16 31 pzgetexp 17 32 pzgetimfiles 33 pztool 34 receivetool 18 35 regtool 19 guidetool 20 chiptool 21 camtool 36 stacktool 37 stamp-h1 22 38 warptool 23 difftool24 stacktool25 faketool26 dettool27 detselect28 pxdata.c29 magictool30 magicdstool31 caltool32 flatcorr33 pstamptool34 disttool35 receivetool36 37 pubtool
-
- Property svn:ignore
-
branches/simtest_nebulous_branches/ippTools/src/pztool.c
r23688 r27840 117 117 telescope, 118 118 uri, 119 NULL // epoch 119 NULL, // epoch 120 0 // use_compress 120 121 )) { 121 122 psError(PS_ERR_UNKNOWN, false, "database error"); … … 304 305 psArray *cameras = pzGetPendingCameras(config); 305 306 if (!cameras) { 306 psError(PXTOOLS_ERR_ DATA, false, "failed to find any cameras");307 psError(PXTOOLS_ERR_CONFIG, false, "failed to find any cameras"); 307 308 return false; 308 309 } … … 314 315 psString query = pxDataGet("pztool_pendingimfile.sql"); 315 316 if (!query) { 316 psError(PXTOOLS_ERR_ DATA, false, "failed to retreive SQL statement");317 psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); 317 318 psFree(cameraImfiles); 318 319 return false; … … 401 402 PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false); 402 403 PXOPT_LOOKUP_BOOL(row_lock, config->args, "-row_lock", false); 404 PXOPT_LOOKUP_S32(bytes, config->args, "-bytes", false, false); 405 PXOPT_LOOKUP_STR(md5sum, config->args, "-md5sum", false, false); 403 406 404 407 // default values … … 457 460 fault, 458 461 NULL, // epoch 459 hostname 462 hostname, 463 bytes, 464 md5sum 460 465 )) { 461 466 psError(PS_ERR_UNKNOWN, false, "database error"); … … 488 493 psString query = pxDataGet("pztool_find_completed_exp.sql"); 489 494 if (!query) { 490 psError(PXTOOLS_ERR_ DATA, false, "failed to retreive SQL statement");495 psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); 491 496 return false; 492 497 } … … 595 600 " pzDownloadImfile.class_id," // tmp_class_id 596 601 " pzDownloadImfile.uri," // uri 597 " NULL" // epoch 602 " NULL," // epoch 603 " pzDownloadImfile.bytes," // bytes 604 " pzDownloadImfile.md5sum" // md5sum 598 605 " FROM pzDownloadImfile" 599 606 " WHERE" … … 777 784 psMetadata *where = psMetadataAlloc(); 778 785 PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); 779 PXOPT_COPY_STR(config->args, where, "-inst", " inst", "==");786 PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); 780 787 PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); 781 788 PXOPT_COPY_STR(config->args, where, "-class", "class", "=="); … … 801 808 psMetadata *where = psMetadataAlloc(); 802 809 PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); 803 PXOPT_COPY_STR(config->args, where, "-inst", " inst", "==");810 PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); 804 811 PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); 805 812 PXOPT_COPY_STR(config->args, where, "-class", "class", "=="); … … 808 815 psString query = pxDataGet("pztool_revertcopied.sql"); 809 816 if (!query) { 810 psError(PXTOOLS_ERR_ DATA, false, "failed to retreive SQL statement");817 psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); 811 818 return false; 812 819 } … … 842 849 psString query = pxDataGet("pztool_revert_downloadimfile_faults.sql"); 843 850 if (!query) { 844 psError(PXTOOLS_ERR_ DATA, false, "failed to retreive SQL statement");851 psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); 845 852 return false; 846 853 } … … 857 864 psString query = pxDataGet("pztool_revert_fileset_faults.sql"); 858 865 if (!query) { 859 psError(PXTOOLS_ERR_ DATA, false, "failed to retreive SQL statement");866 psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); 860 867 return false; 861 868 }
Note:
See TracChangeset
for help on using the changeset viewer.
