Changeset 8103 for branches/jhoblitt/ippdb/src/ippdb.c
- Timestamp:
- Aug 2, 2006, 5:32:12 PM (20 years ago)
- File:
-
- 1 edited
-
branches/jhoblitt/ippdb/src/ippdb.c (modified) (95 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/jhoblitt/ippdb/src/ippdb.c
r8094 r8103 5961 5961 static void rawDetrendExpRowFree(rawDetrendExpRow *object); 5962 5962 5963 rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background)5963 rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background) 5964 5964 { 5965 5965 rawDetrendExpRow *object; … … 5976 5976 object->airmass = airmass; 5977 5977 object->ra = ra; 5978 object->dec = dec;5978 object->decl = decl; 5979 5979 object->exp_time = exp_time; 5980 5980 object->background = background; … … 6043 6043 return false; 6044 6044 } 6045 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, 0.0)) {6046 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");6045 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, 0.0)) { 6046 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 6047 6047 psFree(md); 6048 6048 return false; … … 6071 6071 } 6072 6072 6073 bool rawDetrendExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background)6073 bool rawDetrendExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background) 6074 6074 { 6075 6075 psMetadata *md; … … 6117 6117 return false; 6118 6118 } 6119 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, dec)) {6120 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");6119 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, decl)) { 6120 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 6121 6121 psFree(md); 6122 6122 return false; … … 6139 6139 } 6140 6140 6141 bool rawDetrendExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec , psF32 *exp_time, psF64 *background)6141 bool rawDetrendExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *background) 6142 6142 { 6143 6143 psArray *rowSet; … … 6231 6231 return false; 6232 6232 } 6233 *dec = psMetadataLookupF64(&status, row, "dec");6234 if (!status) { 6235 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");6233 *decl = psMetadataLookupF64(&status, row, "decl"); 6234 if (!status) { 6235 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 6236 6236 psFree(row); 6237 6237 return false; … … 6257 6257 bool rawDetrendExpInsertObject(psDB *dbh, rawDetrendExpRow *object) 6258 6258 { 6259 return rawDetrendExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec , object->exp_time, object->background);6259 return rawDetrendExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->background); 6260 6260 } 6261 6261 … … 6270 6270 psF32 airmass; 6271 6271 psF64 ra; 6272 psF64 dec ;6272 psF64 decl; 6273 6273 psF32 exp_time; 6274 6274 psF64 background; 6275 6275 6276 if (!rawDetrendExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec , &exp_time, &background)) {6276 if (!rawDetrendExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &background)) { 6277 6277 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 6278 6278 return NULL; 6279 6279 } 6280 6280 6281 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background);6281 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background); 6282 6282 } 6283 6283 … … 6418 6418 return NULL; 6419 6419 } 6420 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, object->dec)) {6421 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");6420 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, object->decl)) { 6421 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 6422 6422 psFree(md); 6423 6423 return NULL; … … 6448 6448 psF32 airmass; 6449 6449 psF64 ra; 6450 psF64 dec ;6450 psF64 decl; 6451 6451 psF32 exp_time; 6452 6452 psF64 background; … … 6492 6492 return false; 6493 6493 } 6494 dec = psMetadataLookupF64(&status, md, "dec");6495 if (!status) { 6496 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");6494 decl = psMetadataLookupF64(&status, md, "decl"); 6495 if (!status) { 6496 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 6497 6497 return false; 6498 6498 } … … 6508 6508 } 6509 6509 6510 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background);6510 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background); 6511 6511 } 6512 6512 psArray *rawDetrendExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 6566 6566 static void rawScienceExpRowFree(rawScienceExpRow *object); 6567 6567 6568 rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background)6568 rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background) 6569 6569 { 6570 6570 rawScienceExpRow *object; … … 6581 6581 object->airmass = airmass; 6582 6582 object->ra = ra; 6583 object->dec = dec;6583 object->decl = decl; 6584 6584 object->exp_time = exp_time; 6585 6585 object->background = background; … … 6648 6648 return false; 6649 6649 } 6650 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, 0.0)) {6651 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");6650 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, 0.0)) { 6651 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 6652 6652 psFree(md); 6653 6653 return false; … … 6676 6676 } 6677 6677 6678 bool rawScienceExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background)6678 bool rawScienceExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background) 6679 6679 { 6680 6680 psMetadata *md; … … 6722 6722 return false; 6723 6723 } 6724 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, dec)) {6725 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");6724 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, decl)) { 6725 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 6726 6726 psFree(md); 6727 6727 return false; … … 6744 6744 } 6745 6745 6746 bool rawScienceExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec , psF32 *exp_time, psF64 *background)6746 bool rawScienceExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *background) 6747 6747 { 6748 6748 psArray *rowSet; … … 6836 6836 return false; 6837 6837 } 6838 *dec = psMetadataLookupF64(&status, row, "dec");6839 if (!status) { 6840 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");6838 *decl = psMetadataLookupF64(&status, row, "decl"); 6839 if (!status) { 6840 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 6841 6841 psFree(row); 6842 6842 return false; … … 6862 6862 bool rawScienceExpInsertObject(psDB *dbh, rawScienceExpRow *object) 6863 6863 { 6864 return rawScienceExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec , object->exp_time, object->background);6864 return rawScienceExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->background); 6865 6865 } 6866 6866 … … 6875 6875 psF32 airmass; 6876 6876 psF64 ra; 6877 psF64 dec ;6877 psF64 decl; 6878 6878 psF32 exp_time; 6879 6879 psF64 background; 6880 6880 6881 if (!rawScienceExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec , &exp_time, &background)) {6881 if (!rawScienceExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &background)) { 6882 6882 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 6883 6883 return NULL; 6884 6884 } 6885 6885 6886 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background);6886 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background); 6887 6887 } 6888 6888 … … 7023 7023 return NULL; 7024 7024 } 7025 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, object->dec)) {7026 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");7025 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, object->decl)) { 7026 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 7027 7027 psFree(md); 7028 7028 return NULL; … … 7053 7053 psF32 airmass; 7054 7054 psF64 ra; 7055 psF64 dec ;7055 psF64 decl; 7056 7056 psF32 exp_time; 7057 7057 psF64 background; … … 7097 7097 return false; 7098 7098 } 7099 dec = psMetadataLookupF64(&status, md, "dec");7100 if (!status) { 7101 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");7099 decl = psMetadataLookupF64(&status, md, "decl"); 7100 if (!status) { 7101 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 7102 7102 return false; 7103 7103 } … … 7113 7113 } 7114 7114 7115 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background);7115 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background); 7116 7116 } 7117 7117 psArray *rawScienceExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 7572 7572 static void p1PendingExpRowFree(p1PendingExpRow *object); 7573 7573 7574 p1PendingExpRow *p1PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version)7574 p1PendingExpRow *p1PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version) 7575 7575 { 7576 7576 p1PendingExpRow *object; … … 7587 7587 object->airmass = airmass; 7588 7588 object->ra = ra; 7589 object->dec = dec;7589 object->decl = decl; 7590 7590 object->exp_time = exp_time; 7591 7591 object->background = background; … … 7657 7657 return false; 7658 7658 } 7659 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, 0.0)) {7660 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");7659 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, 0.0)) { 7660 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 7661 7661 psFree(md); 7662 7662 return false; … … 7695 7695 } 7696 7696 7697 bool p1PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version)7697 bool p1PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version) 7698 7698 { 7699 7699 psMetadata *md; … … 7741 7741 return false; 7742 7742 } 7743 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, dec)) {7744 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");7743 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, decl)) { 7744 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 7745 7745 psFree(md); 7746 7746 return false; … … 7773 7773 } 7774 7774 7775 bool p1PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec , psF32 *exp_time, psF64 *background, char **recipe, psS32 *p1_version)7775 bool p1PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *background, char **recipe, psS32 *p1_version) 7776 7776 { 7777 7777 psArray *rowSet; … … 7865 7865 return false; 7866 7866 } 7867 *dec = psMetadataLookupF64(&status, row, "dec");7868 if (!status) { 7869 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");7867 *decl = psMetadataLookupF64(&status, row, "decl"); 7868 if (!status) { 7869 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 7870 7870 psFree(row); 7871 7871 return false; … … 7903 7903 bool p1PendingExpInsertObject(psDB *dbh, p1PendingExpRow *object) 7904 7904 { 7905 return p1PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec , object->exp_time, object->background, object->recipe, object->p1_version);7905 return p1PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->background, object->recipe, object->p1_version); 7906 7906 } 7907 7907 … … 7916 7916 psF32 airmass; 7917 7917 psF64 ra; 7918 psF64 dec ;7918 psF64 decl; 7919 7919 psF32 exp_time; 7920 7920 psF64 background; … … 7922 7922 psS32 p1_version; 7923 7923 7924 if (!p1PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec , &exp_time, &background, (char **)&recipe, &p1_version)) {7924 if (!p1PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &background, (char **)&recipe, &p1_version)) { 7925 7925 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 7926 7926 return NULL; 7927 7927 } 7928 7928 7929 return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background, recipe, p1_version);7929 return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background, recipe, p1_version); 7930 7930 } 7931 7931 … … 8066 8066 return NULL; 8067 8067 } 8068 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, object->dec)) {8069 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");8068 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, object->decl)) { 8069 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 8070 8070 psFree(md); 8071 8071 return NULL; … … 8106 8106 psF32 airmass; 8107 8107 psF64 ra; 8108 psF64 dec ;8108 psF64 decl; 8109 8109 psF32 exp_time; 8110 8110 psF64 background; … … 8152 8152 return false; 8153 8153 } 8154 dec = psMetadataLookupF64(&status, md, "dec");8155 if (!status) { 8156 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");8154 decl = psMetadataLookupF64(&status, md, "decl"); 8155 if (!status) { 8156 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 8157 8157 return false; 8158 8158 } … … 8178 8178 } 8179 8179 8180 return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background, recipe, p1_version);8180 return p1PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background, recipe, p1_version); 8181 8181 } 8182 8182 psArray *p1PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 8236 8236 static void p2PendingExpRowFree(p2PendingExpRow *object); 8237 8237 8238 p2PendingExpRow *p2PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF32 ra, psF64 dec , psF64 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version)8238 p2PendingExpRow *p2PendingExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF32 ra, psF64 decl, psF64 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) 8239 8239 { 8240 8240 p2PendingExpRow *object; … … 8251 8251 object->airmass = airmass; 8252 8252 object->ra = ra; 8253 object->dec = dec;8253 object->decl = decl; 8254 8254 object->exp_time = exp_time; 8255 8255 object->background = background; … … 8322 8322 return false; 8323 8323 } 8324 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, 0.0)) {8325 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");8324 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, 0.0)) { 8325 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 8326 8326 psFree(md); 8327 8327 return false; … … 8365 8365 } 8366 8366 8367 bool p2PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF32 ra, psF64 dec , psF64 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version)8367 bool p2PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF32 ra, psF64 decl, psF64 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) 8368 8368 { 8369 8369 psMetadata *md; … … 8411 8411 return false; 8412 8412 } 8413 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, dec)) {8414 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");8413 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, decl)) { 8414 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 8415 8415 psFree(md); 8416 8416 return false; … … 8448 8448 } 8449 8449 8450 bool p2PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF32 *ra, psF64 *dec , psF64 *exp_time, psF64 *background, char **recipe, psS32 *p1_version, psS32 *p2_version)8450 bool p2PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF32 *ra, psF64 *decl, psF64 *exp_time, psF64 *background, char **recipe, psS32 *p1_version, psS32 *p2_version) 8451 8451 { 8452 8452 psArray *rowSet; … … 8540 8540 return false; 8541 8541 } 8542 *dec = psMetadataLookupF64(&status, row, "dec");8543 if (!status) { 8544 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");8542 *decl = psMetadataLookupF64(&status, row, "decl"); 8543 if (!status) { 8544 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 8545 8545 psFree(row); 8546 8546 return false; … … 8584 8584 bool p2PendingExpInsertObject(psDB *dbh, p2PendingExpRow *object) 8585 8585 { 8586 return p2PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec , object->exp_time, object->background, object->recipe, object->p1_version, object->p2_version);8586 return p2PendingExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->background, object->recipe, object->p1_version, object->p2_version); 8587 8587 } 8588 8588 … … 8597 8597 psF32 airmass; 8598 8598 psF32 ra; 8599 psF64 dec ;8599 psF64 decl; 8600 8600 psF64 exp_time; 8601 8601 psF64 background; … … 8604 8604 psS32 p2_version; 8605 8605 8606 if (!p2PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec , &exp_time, &background, (char **)&recipe, &p1_version, &p2_version)) {8606 if (!p2PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &background, (char **)&recipe, &p1_version, &p2_version)) { 8607 8607 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 8608 8608 return NULL; 8609 8609 } 8610 8610 8611 return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background, recipe, p1_version, p2_version);8611 return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background, recipe, p1_version, p2_version); 8612 8612 } 8613 8613 … … 8748 8748 return NULL; 8749 8749 } 8750 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, object->dec)) {8751 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");8750 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, object->decl)) { 8751 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 8752 8752 psFree(md); 8753 8753 return NULL; … … 8793 8793 psF32 airmass; 8794 8794 psF32 ra; 8795 psF64 dec ;8795 psF64 decl; 8796 8796 psF64 exp_time; 8797 8797 psF64 background; … … 8840 8840 return false; 8841 8841 } 8842 dec = psMetadataLookupF64(&status, md, "dec");8843 if (!status) { 8844 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");8842 decl = psMetadataLookupF64(&status, md, "decl"); 8843 if (!status) { 8844 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 8845 8845 return false; 8846 8846 } … … 8871 8871 } 8872 8872 8873 return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background, recipe, p1_version, p2_version);8873 return p2PendingExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background, recipe, p1_version, p2_version); 8874 8874 } 8875 8875 psArray *p2PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 9388 9388 static void p2DoneExpRowFree(p2DoneExpRow *object); 9389 9389 9390 p2DoneExpRow *p2DoneExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version)9390 p2DoneExpRow *p2DoneExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) 9391 9391 { 9392 9392 p2DoneExpRow *object; … … 9403 9403 object->airmass = airmass; 9404 9404 object->ra = ra; 9405 object->dec = dec;9405 object->decl = decl; 9406 9406 object->exp_time = exp_time; 9407 9407 object->background = background; … … 9474 9474 return false; 9475 9475 } 9476 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, 0.0)) {9477 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");9476 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, 0.0)) { 9477 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 9478 9478 psFree(md); 9479 9479 return false; … … 9517 9517 } 9518 9518 9519 bool p2DoneExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version)9519 bool p2DoneExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background, const char *recipe, psS32 p1_version, psS32 p2_version) 9520 9520 { 9521 9521 psMetadata *md; … … 9563 9563 return false; 9564 9564 } 9565 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, dec)) {9566 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");9565 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, decl)) { 9566 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 9567 9567 psFree(md); 9568 9568 return false; … … 9600 9600 } 9601 9601 9602 bool p2DoneExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec , psF32 *exp_time, psF64 *background, char **recipe, psS32 *p1_version, psS32 *p2_version)9602 bool p2DoneExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *background, char **recipe, psS32 *p1_version, psS32 *p2_version) 9603 9603 { 9604 9604 psArray *rowSet; … … 9692 9692 return false; 9693 9693 } 9694 *dec = psMetadataLookupF64(&status, row, "dec");9695 if (!status) { 9696 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");9694 *decl = psMetadataLookupF64(&status, row, "decl"); 9695 if (!status) { 9696 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 9697 9697 psFree(row); 9698 9698 return false; … … 9736 9736 bool p2DoneExpInsertObject(psDB *dbh, p2DoneExpRow *object) 9737 9737 { 9738 return p2DoneExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec , object->exp_time, object->background, object->recipe, object->p1_version, object->p2_version);9738 return p2DoneExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->background, object->recipe, object->p1_version, object->p2_version); 9739 9739 } 9740 9740 … … 9749 9749 psF32 airmass; 9750 9750 psF64 ra; 9751 psF64 dec ;9751 psF64 decl; 9752 9752 psF32 exp_time; 9753 9753 psF64 background; … … 9756 9756 psS32 p2_version; 9757 9757 9758 if (!p2DoneExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec , &exp_time, &background, (char **)&recipe, &p1_version, &p2_version)) {9758 if (!p2DoneExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &background, (char **)&recipe, &p1_version, &p2_version)) { 9759 9759 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 9760 9760 return NULL; 9761 9761 } 9762 9762 9763 return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background, recipe, p1_version, p2_version);9763 return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background, recipe, p1_version, p2_version); 9764 9764 } 9765 9765 … … 9900 9900 return NULL; 9901 9901 } 9902 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, object->dec)) {9903 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");9902 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, object->decl)) { 9903 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 9904 9904 psFree(md); 9905 9905 return NULL; … … 9945 9945 psF32 airmass; 9946 9946 psF64 ra; 9947 psF64 dec ;9947 psF64 decl; 9948 9948 psF32 exp_time; 9949 9949 psF64 background; … … 9992 9992 return false; 9993 9993 } 9994 dec = psMetadataLookupF64(&status, md, "dec");9995 if (!status) { 9996 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");9994 decl = psMetadataLookupF64(&status, md, "decl"); 9995 if (!status) { 9996 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 9997 9997 return false; 9998 9998 } … … 10023 10023 } 10024 10024 10025 return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background, recipe, p1_version, p2_version);10025 return p2DoneExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background, recipe, p1_version, p2_version); 10026 10026 } 10027 10027 psArray *p2DoneExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 10540 10540 static void p3PendingExpRowFree(p3PendingExpRow *object); 10541 10541 10542 p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background, const char *recipe, psS32 p2_version, psS32 p3_version)10542 p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background, const char *recipe, psS32 p2_version, psS32 p3_version) 10543 10543 { 10544 10544 p3PendingExpRow *object; … … 10554 10554 object->airmass = airmass; 10555 10555 object->ra = ra; 10556 object->dec = dec;10556 object->decl = decl; 10557 10557 object->exp_time = exp_time; 10558 10558 object->background = background; … … 10619 10619 return false; 10620 10620 } 10621 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, 0.0)) {10622 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");10621 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, 0.0)) { 10622 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 10623 10623 psFree(md); 10624 10624 return false; … … 10662 10662 } 10663 10663 10664 bool p3PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background, const char *recipe, psS32 p2_version, psS32 p3_version)10664 bool p3PendingExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background, const char *recipe, psS32 p2_version, psS32 p3_version) 10665 10665 { 10666 10666 psMetadata *md; … … 10703 10703 return false; 10704 10704 } 10705 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, dec)) {10706 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");10705 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, decl)) { 10706 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 10707 10707 psFree(md); 10708 10708 return false; … … 10740 10740 } 10741 10741 10742 bool p3PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec , psF32 *exp_time, psF64 *background, char **recipe, psS32 *p2_version, psS32 *p3_version)10742 bool p3PendingExpPop(psDB *dbh, char **exp_id, char **camera, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *background, char **recipe, psS32 *p2_version, psS32 *p3_version) 10743 10743 { 10744 10744 psArray *rowSet; … … 10826 10826 return false; 10827 10827 } 10828 *dec = psMetadataLookupF64(&status, row, "dec");10829 if (!status) { 10830 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");10828 *decl = psMetadataLookupF64(&status, row, "decl"); 10829 if (!status) { 10830 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 10831 10831 psFree(row); 10832 10832 return false; … … 10870 10870 bool p3PendingExpInsertObject(psDB *dbh, p3PendingExpRow *object) 10871 10871 { 10872 return p3PendingExpInsert(dbh, object->exp_id, object->camera, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec , object->exp_time, object->background, object->recipe, object->p2_version, object->p3_version);10872 return p3PendingExpInsert(dbh, object->exp_id, object->camera, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->background, object->recipe, object->p2_version, object->p3_version); 10873 10873 } 10874 10874 … … 10882 10882 psF32 airmass; 10883 10883 psF64 ra; 10884 psF64 dec ;10884 psF64 decl; 10885 10885 psF32 exp_time; 10886 10886 psF64 background; … … 10889 10889 psS32 p3_version; 10890 10890 10891 if (!p3PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec , &exp_time, &background, (char **)&recipe, &p2_version, &p3_version)) {10891 if (!p3PendingExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &background, (char **)&recipe, &p2_version, &p3_version)) { 10892 10892 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 10893 10893 return NULL; 10894 10894 } 10895 10895 10896 return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background, recipe, p2_version, p3_version);10896 return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background, recipe, p2_version, p3_version); 10897 10897 } 10898 10898 … … 11028 11028 return NULL; 11029 11029 } 11030 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, object->dec)) {11031 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");11030 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, object->decl)) { 11031 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 11032 11032 psFree(md); 11033 11033 return NULL; … … 11072 11072 psF32 airmass; 11073 11073 psF64 ra; 11074 psF64 dec ;11074 psF64 decl; 11075 11075 psF32 exp_time; 11076 11076 psF64 background; … … 11114 11114 return false; 11115 11115 } 11116 dec = psMetadataLookupF64(&status, md, "dec");11117 if (!status) { 11118 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");11116 decl = psMetadataLookupF64(&status, md, "decl"); 11117 if (!status) { 11118 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 11119 11119 return false; 11120 11120 } … … 11145 11145 } 11146 11146 11147 return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background, recipe, p2_version, p3_version);11147 return p3PendingExpRowAlloc(exp_id, camera, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background, recipe, p2_version, p3_version); 11148 11148 } 11149 11149 psArray *p3PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 11543 11543 static void detInputExpRowFree(detInputExpRow *object); 11544 11544 11545 detInputExpRow *detInputExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background)11545 detInputExpRow *detInputExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background) 11546 11546 { 11547 11547 detInputExpRow *object; … … 11560 11560 object->airmass = airmass; 11561 11561 object->ra = ra; 11562 object->dec = dec;11562 object->decl = decl; 11563 11563 object->exp_time = exp_time; 11564 11564 object->background = background; … … 11637 11637 return false; 11638 11638 } 11639 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, 0.0)) {11640 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");11639 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, 0.0)) { 11640 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 11641 11641 psFree(md); 11642 11642 return false; … … 11665 11665 } 11666 11666 11667 bool detInputExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 dec , psF32 exp_time, psF64 background)11667 bool detInputExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 background) 11668 11668 { 11669 11669 psMetadata *md; … … 11721 11721 return false; 11722 11722 } 11723 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, dec)) {11724 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");11723 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, decl)) { 11724 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 11725 11725 psFree(md); 11726 11726 return false; … … 11743 11743 } 11744 11744 11745 bool detInputExpPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *dec , psF32 *exp_time, psF64 *background)11745 bool detInputExpPop(psDB *dbh, psS32 *det_id, psS32 *iteration, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *background) 11746 11746 { 11747 11747 psArray *rowSet; … … 11847 11847 return false; 11848 11848 } 11849 *dec = psMetadataLookupF64(&status, row, "dec");11850 if (!status) { 11851 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");11849 *decl = psMetadataLookupF64(&status, row, "decl"); 11850 if (!status) { 11851 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 11852 11852 psFree(row); 11853 11853 return false; … … 11873 11873 bool detInputExpInsertObject(psDB *dbh, detInputExpRow *object) 11874 11874 { 11875 return detInputExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->dec , object->exp_time, object->background);11875 return detInputExpInsert(dbh, object->det_id, object->iteration, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->background); 11876 11876 } 11877 11877 … … 11888 11888 psF32 airmass; 11889 11889 psF64 ra; 11890 psF64 dec ;11890 psF64 decl; 11891 11891 psF32 exp_time; 11892 11892 psF64 background; 11893 11893 11894 if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &dec , &exp_time, &background)) {11894 if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &background)) { 11895 11895 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 11896 11896 return NULL; 11897 11897 } 11898 11898 11899 return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background);11899 return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background); 11900 11900 } 11901 11901 … … 12046 12046 return NULL; 12047 12047 } 12048 if (!psMetadataAddF64(md, PS_LIST_TAIL, "dec ", 0, NULL, object->dec)) {12049 psError(PS_ERR_UNKNOWN, false, "failed to add item dec ");12048 if (!psMetadataAddF64(md, PS_LIST_TAIL, "decl", 0, NULL, object->decl)) { 12049 psError(PS_ERR_UNKNOWN, false, "failed to add item decl"); 12050 12050 psFree(md); 12051 12051 return NULL; … … 12078 12078 psF32 airmass; 12079 12079 psF64 ra; 12080 psF64 dec ;12080 psF64 decl; 12081 12081 psF32 exp_time; 12082 12082 psF64 background; … … 12132 12132 return false; 12133 12133 } 12134 dec = psMetadataLookupF64(&status, md, "dec");12135 if (!status) { 12136 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item dec ");12134 decl = psMetadataLookupF64(&status, md, "decl"); 12135 if (!status) { 12136 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item decl"); 12137 12137 return false; 12138 12138 } … … 12148 12148 } 12149 12149 12150 return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec , exp_time, background);12150 return detInputExpRowAlloc(det_id, iteration, exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, background); 12151 12151 } 12152 12152 psArray *detInputExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Note:
See TracChangeset
for help on using the changeset viewer.
