Changeset 9242 for trunk/ippdb/src/ippdb.c
- Timestamp:
- Oct 4, 2006, 1:17:06 PM (20 years ago)
- File:
-
- 1 edited
-
trunk/ippdb/src/ippdb.c (modified) (39 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippdb/src/ippdb.c
r9229 r9242 7194 7194 static void rawDetrendExpRowFree(rawDetrendExpRow *object); 7195 7195 7196 rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_tag, 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 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *ob stype)7196 rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_tag, 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 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object) 7197 7197 { 7198 7198 rawDetrendExpRow *object; … … 7218 7218 object->ccd_temp = ccd_temp; 7219 7219 object->posang = posang; 7220 object->ob stype = psStringCopy(obstype);7220 object->object = psStringCopy(object); 7221 7221 7222 7222 return object; … … 7230 7230 psFree(object->exp_type); 7231 7231 psFree(object->filter); 7232 psFree(object->ob stype);7232 psFree(object->object); 7233 7233 } 7234 7234 … … 7329 7329 return false; 7330 7330 } 7331 if (!psMetadataAddStr(md, PS_LIST_TAIL, "ob stype", 0, NULL, "64")) {7332 psError(PS_ERR_UNKNOWN, false, "failed to add item ob stype");7331 if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "64")) { 7332 psError(PS_ERR_UNKNOWN, false, "failed to add item object"); 7333 7333 psFree(md); 7334 7334 return false; … … 7347 7347 } 7348 7348 7349 bool rawDetrendExpInsert(psDB * dbh, const char *exp_tag, 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 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *ob stype)7349 bool rawDetrendExpInsert(psDB * dbh, const char *exp_tag, 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 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object) 7350 7350 { 7351 7351 psMetadata *md; … … 7438 7438 return false; 7439 7439 } 7440 if (!psMetadataAddStr(md, PS_LIST_TAIL, "ob stype", 0, NULL, obstype)) {7441 psError(PS_ERR_UNKNOWN, false, "failed to add item ob stype");7440 if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object)) { 7441 psError(PS_ERR_UNKNOWN, false, "failed to add item object"); 7442 7442 psFree(md); 7443 7443 return false; … … 7464 7464 return deleted; 7465 7465 } 7466 bool rawDetrendExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **ob stype)7466 bool rawDetrendExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **object) 7467 7467 { 7468 7468 psArray *rowSet; … … 7610 7610 return false; 7611 7611 } 7612 *ob stype = psMetadataLookupPtr(&status, row, "obstype");7613 if (!status) { 7614 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ob stype");7612 *object = psMetadataLookupPtr(&status, row, "object"); 7613 if (!status) { 7614 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object"); 7615 7615 psFree(row); 7616 7616 return false; … … 7624 7624 bool rawDetrendExpInsertObject(psDB *dbh, rawDetrendExpRow *object) 7625 7625 { 7626 return rawDetrendExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->ob stype);7626 return rawDetrendExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object); 7627 7627 } 7628 7628 … … 7657 7657 psF32 ccd_temp; 7658 7658 psF64 posang; 7659 char ob stype[256];7660 7661 if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&ob stype)) {7659 char object[256]; 7660 7661 if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) { 7662 7662 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 7663 7663 return NULL; 7664 7664 } 7665 7665 7666 return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, ob stype);7666 return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object); 7667 7667 } 7668 7668 … … 7848 7848 return NULL; 7849 7849 } 7850 if (!psMetadataAddStr(md, PS_LIST_TAIL, "ob stype", 0, NULL, object->obstype)) {7851 psError(PS_ERR_UNKNOWN, false, "failed to add item ob stype");7850 if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object->object)) { 7851 psError(PS_ERR_UNKNOWN, false, "failed to add item object"); 7852 7852 psFree(md); 7853 7853 return NULL; … … 7877 7877 psF32 ccd_temp; 7878 7878 psF64 posang; 7879 char *ob stype;7879 char *object; 7880 7880 7881 7881 exp_tag = psMetadataLookupPtr(&status, md, "exp_tag"); … … 7964 7964 return false; 7965 7965 } 7966 ob stype = psMetadataLookupPtr(&status, md, "obstype");7967 if (!status) { 7968 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ob stype");7969 return false; 7970 } 7971 7972 return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, ob stype);7966 object = psMetadataLookupPtr(&status, md, "object"); 7967 if (!status) { 7968 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object"); 7969 return false; 7970 } 7971 7972 return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object); 7973 7973 } 7974 7974 psArray *rawDetrendExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 8077 8077 static void rawScienceExpRowFree(rawScienceExpRow *object); 8078 8078 8079 rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_tag, 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 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *ob stype)8079 rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_tag, 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 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object) 8080 8080 { 8081 8081 rawScienceExpRow *object; … … 8101 8101 object->ccd_temp = ccd_temp; 8102 8102 object->posang = posang; 8103 object->ob stype = psStringCopy(obstype);8103 object->object = psStringCopy(object); 8104 8104 8105 8105 return object; … … 8113 8113 psFree(object->exp_type); 8114 8114 psFree(object->filter); 8115 psFree(object->ob stype);8115 psFree(object->object); 8116 8116 } 8117 8117 … … 8212 8212 return false; 8213 8213 } 8214 if (!psMetadataAddStr(md, PS_LIST_TAIL, "ob stype", 0, NULL, "64")) {8215 psError(PS_ERR_UNKNOWN, false, "failed to add item ob stype");8214 if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "64")) { 8215 psError(PS_ERR_UNKNOWN, false, "failed to add item object"); 8216 8216 psFree(md); 8217 8217 return false; … … 8230 8230 } 8231 8231 8232 bool rawScienceExpInsert(psDB * dbh, const char *exp_tag, 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 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *ob stype)8232 bool rawScienceExpInsert(psDB * dbh, const char *exp_tag, 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 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object) 8233 8233 { 8234 8234 psMetadata *md; … … 8321 8321 return false; 8322 8322 } 8323 if (!psMetadataAddStr(md, PS_LIST_TAIL, "ob stype", 0, NULL, obstype)) {8324 psError(PS_ERR_UNKNOWN, false, "failed to add item ob stype");8323 if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object)) { 8324 psError(PS_ERR_UNKNOWN, false, "failed to add item object"); 8325 8325 psFree(md); 8326 8326 return false; … … 8347 8347 return deleted; 8348 8348 } 8349 bool rawScienceExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **ob stype)8349 bool rawScienceExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **object) 8350 8350 { 8351 8351 psArray *rowSet; … … 8493 8493 return false; 8494 8494 } 8495 *ob stype = psMetadataLookupPtr(&status, row, "obstype");8496 if (!status) { 8497 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ob stype");8495 *object = psMetadataLookupPtr(&status, row, "object"); 8496 if (!status) { 8497 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object"); 8498 8498 psFree(row); 8499 8499 return false; … … 8507 8507 bool rawScienceExpInsertObject(psDB *dbh, rawScienceExpRow *object) 8508 8508 { 8509 return rawScienceExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->ob stype);8509 return rawScienceExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object); 8510 8510 } 8511 8511 … … 8540 8540 psF32 ccd_temp; 8541 8541 psF64 posang; 8542 char ob stype[256];8543 8544 if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&ob stype)) {8542 char object[256]; 8543 8544 if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) { 8545 8545 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 8546 8546 return NULL; 8547 8547 } 8548 8548 8549 return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, ob stype);8549 return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object); 8550 8550 } 8551 8551 … … 8731 8731 return NULL; 8732 8732 } 8733 if (!psMetadataAddStr(md, PS_LIST_TAIL, "ob stype", 0, NULL, object->obstype)) {8734 psError(PS_ERR_UNKNOWN, false, "failed to add item ob stype");8733 if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object->object)) { 8734 psError(PS_ERR_UNKNOWN, false, "failed to add item object"); 8735 8735 psFree(md); 8736 8736 return NULL; … … 8760 8760 psF32 ccd_temp; 8761 8761 psF64 posang; 8762 char *ob stype;8762 char *object; 8763 8763 8764 8764 exp_tag = psMetadataLookupPtr(&status, md, "exp_tag"); … … 8847 8847 return false; 8848 8848 } 8849 ob stype = psMetadataLookupPtr(&status, md, "obstype");8850 if (!status) { 8851 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ob stype");8852 return false; 8853 } 8854 8855 return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, ob stype);8849 object = psMetadataLookupPtr(&status, md, "object"); 8850 if (!status) { 8851 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object"); 8852 return false; 8853 } 8854 8855 return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object); 8856 8856 } 8857 8857 psArray *rawScienceExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 8960 8960 static void rawImfileRowFree(rawImfileRow *object); 8961 8961 8962 rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *ob stype)8962 rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object) 8963 8963 { 8964 8964 rawImfileRow *object; … … 8984 8984 object->ccd_temp = ccd_temp; 8985 8985 object->posang = posang; 8986 object->ob stype = psStringCopy(obstype);8986 object->object = psStringCopy(object); 8987 8987 8988 8988 return object; … … 8997 8997 psFree(object->exp_type); 8998 8998 psFree(object->filter); 8999 psFree(object->ob stype);8999 psFree(object->object); 9000 9000 } 9001 9001 … … 9096 9096 return false; 9097 9097 } 9098 if (!psMetadataAddStr(md, PS_LIST_TAIL, "ob stype", 0, NULL, "64")) {9099 psError(PS_ERR_UNKNOWN, false, "failed to add item ob stype");9098 if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "64")) { 9099 psError(PS_ERR_UNKNOWN, false, "failed to add item object"); 9100 9100 psFree(md); 9101 9101 return false; … … 9114 9114 } 9115 9115 9116 bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *ob stype)9116 bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object) 9117 9117 { 9118 9118 psMetadata *md; … … 9205 9205 return false; 9206 9206 } 9207 if (!psMetadataAddStr(md, PS_LIST_TAIL, "ob stype", 0, NULL, obstype)) {9208 psError(PS_ERR_UNKNOWN, false, "failed to add item ob stype");9207 if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object)) { 9208 psError(PS_ERR_UNKNOWN, false, "failed to add item object"); 9209 9209 psFree(md); 9210 9210 return false; … … 9231 9231 return deleted; 9232 9232 } 9233 bool rawImfilePop(psDB *dbh, char **exp_tag, char **class, char **class_id, char **uri, char **exp_type, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **ob stype)9233 bool rawImfilePop(psDB *dbh, char **exp_tag, char **class, char **class_id, char **uri, char **exp_type, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **object) 9234 9234 { 9235 9235 psArray *rowSet; … … 9377 9377 return false; 9378 9378 } 9379 *ob stype = psMetadataLookupPtr(&status, row, "obstype");9380 if (!status) { 9381 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ob stype");9379 *object = psMetadataLookupPtr(&status, row, "object"); 9380 if (!status) { 9381 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object"); 9382 9382 psFree(row); 9383 9383 return false; … … 9391 9391 bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object) 9392 9392 { 9393 return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->ob stype);9393 return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object); 9394 9394 } 9395 9395 … … 9424 9424 psF32 ccd_temp; 9425 9425 psF64 posang; 9426 char ob stype[256];9427 9428 if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&ob stype)) {9426 char object[256]; 9427 9428 if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) { 9429 9429 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 9430 9430 return NULL; 9431 9431 } 9432 9432 9433 return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, ob stype);9433 return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object); 9434 9434 } 9435 9435 … … 9615 9615 return NULL; 9616 9616 } 9617 if (!psMetadataAddStr(md, PS_LIST_TAIL, "ob stype", 0, NULL, object->obstype)) {9618 psError(PS_ERR_UNKNOWN, false, "failed to add item ob stype");9617 if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object->object)) { 9618 psError(PS_ERR_UNKNOWN, false, "failed to add item object"); 9619 9619 psFree(md); 9620 9620 return NULL; … … 9644 9644 psF32 ccd_temp; 9645 9645 psF64 posang; 9646 char *ob stype;9646 char *object; 9647 9647 9648 9648 exp_tag = psMetadataLookupPtr(&status, md, "exp_tag"); … … 9731 9731 return false; 9732 9732 } 9733 ob stype = psMetadataLookupPtr(&status, md, "obstype");9734 if (!status) { 9735 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ob stype");9736 return false; 9737 } 9738 9739 return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, ob stype);9733 object = psMetadataLookupPtr(&status, md, "object"); 9734 if (!status) { 9735 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object"); 9736 return false; 9737 } 9738 9739 return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object); 9740 9740 } 9741 9741 psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Note:
See TracChangeset
for help on using the changeset viewer.
