Changeset 17833 for trunk/ippdb/src/ippdb.c
- Timestamp:
- May 28, 2008, 11:52:21 AM (18 years ago)
- File:
-
- 1 edited
-
trunk/ippdb/src/ippdb.c (modified) (40 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippdb/src/ippdb.c
r17570 r17833 3074 3074 static void rawExpRowFree(rawExpRow *object); 3075 3075 3076 rawExpRow *rawExpRowAlloc(psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *exp_tag, const char *exp_type, const char *filelevel, const char *workdir, const char *reduction, const char *dvodb, const char *tess_id, const char *end_stage, const char *filter, const char *comment, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF32 m1_x, psF32 m1_y, psF32 m1_z, psF32 m1_tip, psF32 m1_tilt, psF32 m2_x, psF32 m2_y, psF32 m2_z, psF32 m2_tip, psF32 m2_tilt, psF32 env_temperature, psF32 env_humidity, psF32 env_wind_speed, psF32 env_wind_dir, psF32 teltemp_m1, psF32 teltemp_m1cell, psF32 teltemp_m2, psF32 teltemp_spider, psF32 teltemp_truss, psF32 teltemp_extra, psF32 pon_time, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, psF32 solang, psS16 fault)3076 rawExpRow *rawExpRowAlloc(psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *exp_tag, const char *exp_type, const char *filelevel, const char *workdir, const char *reduction, const char *dvodb, const char *tess_id, const char *end_stage, const char *filter, const char *comment, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF32 m1_x, psF32 m1_y, psF32 m1_z, psF32 m1_tip, psF32 m1_tilt, psF32 m2_x, psF32 m2_y, psF32 m2_z, psF32 m2_tip, psF32 m2_tilt, psF32 env_temperature, psF32 env_humidity, psF32 env_wind_speed, psF32 env_wind_dir, psF32 teltemp_m1, psF32 teltemp_m1cell, psF32 teltemp_m2, psF32 teltemp_spider, psF32 teltemp_truss, psF32 teltemp_extra, psF32 pon_time, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, psF32 solang, const char *hostname, psS16 fault) 3077 3077 { 3078 3078 rawExpRow *_object; … … 3136 3136 _object->object = psStringCopy(object); 3137 3137 _object->solang = solang; 3138 _object->hostname = psStringCopy(hostname); 3138 3139 _object->fault = fault; 3139 3140 … … 3158 3159 psFree(object->comment); 3159 3160 psFree(object->object); 3161 psFree(object->hostname); 3160 3162 } 3161 3163 … … 3168 3170 return false; 3169 3171 } 3170 if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_name", PS_DATA_STRING, NULL, "64")) {3172 if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_name", PS_DATA_STRING, "Key", "64")) { 3171 3173 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_name"); 3172 3174 psFree(md); … … 3438 3440 return false; 3439 3441 } 3442 if (!psMetadataAdd(md, PS_LIST_TAIL, "hostname", PS_DATA_STRING, NULL, "64")) { 3443 psError(PS_ERR_UNKNOWN, false, "failed to add item hostname"); 3444 psFree(md); 3445 return false; 3446 } 3440 3447 if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "Key NOT NULL", 0)) { 3441 3448 psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); … … 3456 3463 } 3457 3464 3458 bool rawExpInsert(psDB * dbh, psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *exp_tag, const char *exp_type, const char *filelevel, const char *workdir, const char *reduction, const char *dvodb, const char *tess_id, const char *end_stage, const char *filter, const char *comment, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF32 m1_x, psF32 m1_y, psF32 m1_z, psF32 m1_tip, psF32 m1_tilt, psF32 m2_x, psF32 m2_y, psF32 m2_z, psF32 m2_tip, psF32 m2_tilt, psF32 env_temperature, psF32 env_humidity, psF32 env_wind_speed, psF32 env_wind_dir, psF32 teltemp_m1, psF32 teltemp_m1cell, psF32 teltemp_m2, psF32 teltemp_spider, psF32 teltemp_truss, psF32 teltemp_extra, psF32 pon_time, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, psF32 solang, psS16 fault)3465 bool rawExpInsert(psDB * dbh, psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *exp_tag, const char *exp_type, const char *filelevel, const char *workdir, const char *reduction, const char *dvodb, const char *tess_id, const char *end_stage, const char *filter, const char *comment, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF32 m1_x, psF32 m1_y, psF32 m1_z, psF32 m1_tip, psF32 m1_tilt, psF32 m2_x, psF32 m2_y, psF32 m2_z, psF32 m2_tip, psF32 m2_tilt, psF32 env_temperature, psF32 env_humidity, psF32 env_wind_speed, psF32 env_wind_dir, psF32 teltemp_m1, psF32 teltemp_m1cell, psF32 teltemp_m2, psF32 teltemp_spider, psF32 teltemp_truss, psF32 teltemp_extra, psF32 pon_time, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, psF32 solang, const char *hostname, psS16 fault) 3459 3466 { 3460 3467 psMetadata *md = psMetadataAlloc(); … … 3731 3738 if (!psMetadataAdd(md, PS_LIST_TAIL, "solang", PS_DATA_F32, NULL, solang)) { 3732 3739 psError(PS_ERR_UNKNOWN, false, "failed to add item solang"); 3740 psFree(md); 3741 return false; 3742 } 3743 if (!psMetadataAdd(md, PS_LIST_TAIL, "hostname", PS_DATA_STRING, NULL, hostname)) { 3744 psError(PS_ERR_UNKNOWN, false, "failed to add item hostname"); 3733 3745 psFree(md); 3734 3746 return false; … … 3762 3774 bool rawExpInsertObject(psDB *dbh, rawExpRow *object) 3763 3775 { 3764 return rawExpInsert(dbh, object->exp_id, object->exp_name, object->camera, object->telescope, object->dateobs, object->exp_tag, object->exp_type, object->filelevel, object->workdir, object->reduction, object->dvodb, object->tess_id, object->end_stage, object->filter, object->comment, object->airmass, object->ra, object->decl, object->exp_time, object->sat_pixel_frac, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->m1_x, object->m1_y, object->m1_z, object->m1_tip, object->m1_tilt, object->m2_x, object->m2_y, object->m2_z, object->m2_tip, object->m2_tilt, object->env_temperature, object->env_humidity, object->env_wind_speed, object->env_wind_dir, object->teltemp_m1, object->teltemp_m1cell, object->teltemp_m2, object->teltemp_spider, object->teltemp_truss, object->teltemp_extra, object->pon_time, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->object, object->solang, object-> fault);3776 return rawExpInsert(dbh, object->exp_id, object->exp_name, object->camera, object->telescope, object->dateobs, object->exp_tag, object->exp_type, object->filelevel, object->workdir, object->reduction, object->dvodb, object->tess_id, object->end_stage, object->filter, object->comment, object->airmass, object->ra, object->decl, object->exp_time, object->sat_pixel_frac, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->m1_x, object->m1_y, object->m1_z, object->m1_tip, object->m1_tilt, object->m2_x, object->m2_y, object->m2_z, object->m2_tip, object->m2_tilt, object->env_temperature, object->env_humidity, object->env_wind_speed, object->env_wind_dir, object->teltemp_m1, object->teltemp_m1cell, object->teltemp_m2, object->teltemp_spider, object->teltemp_truss, object->teltemp_extra, object->pon_time, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->object, object->solang, object->hostname, object->fault); 3765 3777 } 3766 3778 … … 4110 4122 return false; 4111 4123 } 4124 if (!psMetadataAdd(md, PS_LIST_TAIL, "hostname", PS_DATA_STRING, NULL, object->hostname)) { 4125 psError(PS_ERR_UNKNOWN, false, "failed to add item hostname"); 4126 psFree(md); 4127 return false; 4128 } 4112 4129 if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) { 4113 4130 psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); … … 4399 4416 return false; 4400 4417 } 4418 char* hostname = psMetadataLookupPtr(&status, md, "hostname"); 4419 if (!status) { 4420 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item hostname"); 4421 return false; 4422 } 4401 4423 psS16 fault = psMetadataLookupS16(&status, md, "fault"); 4402 4424 if (!status) { … … 4405 4427 } 4406 4428 4407 return rawExpRowAlloc(exp_id, exp_name, camera, telescope, dateobs, exp_tag, exp_type, filelevel, workdir, reduction, dvodb, tess_id, end_stage, filter, comment, airmass, ra, decl, exp_time, sat_pixel_frac, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, m1_x, m1_y, m1_z, m1_tip, m1_tilt, m2_x, m2_y, m2_z, m2_tip, m2_tilt, env_temperature, env_humidity, env_wind_speed, env_wind_dir, teltemp_m1, teltemp_m1cell, teltemp_m2, teltemp_spider, teltemp_truss, teltemp_extra, pon_time, user_1, user_2, user_3, user_4, user_5, object, solang, fault);4429 return rawExpRowAlloc(exp_id, exp_name, camera, telescope, dateobs, exp_tag, exp_type, filelevel, workdir, reduction, dvodb, tess_id, end_stage, filter, comment, airmass, ra, decl, exp_time, sat_pixel_frac, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, m1_x, m1_y, m1_z, m1_tip, m1_tilt, m2_x, m2_y, m2_z, m2_tip, m2_tilt, env_temperature, env_humidity, env_wind_speed, env_wind_dir, teltemp_m1, teltemp_m1cell, teltemp_m2, teltemp_spider, teltemp_truss, teltemp_extra, pon_time, user_1, user_2, user_3, user_4, user_5, object, solang, hostname, fault); 4408 4430 } 4409 4431 psArray *rawExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 4523 4545 static void rawImfileRowFree(rawImfileRow *object); 4524 4546 4525 rawImfileRow *rawImfileRowAlloc(psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *tmp_class_id, const char *class_id, const char *uri, const char *exp_type, const char *filelevel, const char *filter, const char *comment, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF32 m1_x, psF32 m1_y, psF32 m1_z, psF32 m1_tip, psF32 m1_tilt, psF32 m2_x, psF32 m2_y, psF32 m2_z, psF32 m2_tip, psF32 m2_tilt, psF32 env_temperature, psF32 env_humidity, psF32 env_wind_speed, psF32 env_wind_dir, psF32 teltemp_m1, psF32 teltemp_m1cell, psF32 teltemp_m2, psF32 teltemp_spider, psF32 teltemp_truss, psF32 teltemp_extra, psF32 pon_time, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, psS16 fault)4547 rawImfileRow *rawImfileRowAlloc(psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *tmp_class_id, const char *class_id, const char *uri, const char *exp_type, const char *filelevel, const char *filter, const char *comment, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF32 m1_x, psF32 m1_y, psF32 m1_z, psF32 m1_tip, psF32 m1_tilt, psF32 m2_x, psF32 m2_y, psF32 m2_z, psF32 m2_tip, psF32 m2_tilt, psF32 env_temperature, psF32 env_humidity, psF32 env_wind_speed, psF32 env_wind_dir, psF32 teltemp_m1, psF32 teltemp_m1cell, psF32 teltemp_m2, psF32 teltemp_spider, psF32 teltemp_truss, psF32 teltemp_extra, psF32 pon_time, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, const char *hostname, psS16 fault) 4526 4548 { 4527 4549 rawImfileRow *_object; … … 4581 4603 _object->user_5 = user_5; 4582 4604 _object->object = psStringCopy(object); 4605 _object->hostname = psStringCopy(hostname); 4583 4606 _object->fault = fault; 4584 4607 … … 4600 4623 psFree(object->comment); 4601 4624 psFree(object->object); 4625 psFree(object->hostname); 4602 4626 } 4603 4627 … … 4610 4634 return false; 4611 4635 } 4612 if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_name", PS_DATA_STRING, NULL, "64")) {4636 if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_name", PS_DATA_STRING, "UNIQUE(exp_id, tmp_class_id)", "64")) { 4613 4637 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_name"); 4614 4638 psFree(md); … … 4860 4884 return false; 4861 4885 } 4886 if (!psMetadataAdd(md, PS_LIST_TAIL, "hostname", PS_DATA_STRING, NULL, "64")) { 4887 psError(PS_ERR_UNKNOWN, false, "failed to add item hostname"); 4888 psFree(md); 4889 return false; 4890 } 4862 4891 if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "Key NOT NULL", 0)) { 4863 4892 psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); … … 4878 4907 } 4879 4908 4880 bool rawImfileInsert(psDB * dbh, psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *tmp_class_id, const char *class_id, const char *uri, const char *exp_type, const char *filelevel, const char *filter, const char *comment, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF32 m1_x, psF32 m1_y, psF32 m1_z, psF32 m1_tip, psF32 m1_tilt, psF32 m2_x, psF32 m2_y, psF32 m2_z, psF32 m2_tip, psF32 m2_tilt, psF32 env_temperature, psF32 env_humidity, psF32 env_wind_speed, psF32 env_wind_dir, psF32 teltemp_m1, psF32 teltemp_m1cell, psF32 teltemp_m2, psF32 teltemp_spider, psF32 teltemp_truss, psF32 teltemp_extra, psF32 pon_time, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, psS16 fault)4909 bool rawImfileInsert(psDB * dbh, psS64 exp_id, const char *exp_name, const char *camera, const char *telescope, psTime* dateobs, const char *tmp_class_id, const char *class_id, const char *uri, const char *exp_type, const char *filelevel, const char *filter, const char *comment, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF32 sat_pixel_frac, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, psF32 m1_x, psF32 m1_y, psF32 m1_z, psF32 m1_tip, psF32 m1_tilt, psF32 m2_x, psF32 m2_y, psF32 m2_z, psF32 m2_tip, psF32 m2_tilt, psF32 env_temperature, psF32 env_humidity, psF32 env_wind_speed, psF32 env_wind_dir, psF32 teltemp_m1, psF32 teltemp_m1cell, psF32 teltemp_m2, psF32 teltemp_spider, psF32 teltemp_truss, psF32 teltemp_extra, psF32 pon_time, psF64 user_1, psF64 user_2, psF64 user_3, psF64 user_4, psF64 user_5, const char *object, const char *hostname, psS16 fault) 4881 4910 { 4882 4911 psMetadata *md = psMetadataAlloc(); … … 5133 5162 if (!psMetadataAdd(md, PS_LIST_TAIL, "object", PS_DATA_STRING, NULL, object)) { 5134 5163 psError(PS_ERR_UNKNOWN, false, "failed to add item object"); 5164 psFree(md); 5165 return false; 5166 } 5167 if (!psMetadataAdd(md, PS_LIST_TAIL, "hostname", PS_DATA_STRING, NULL, hostname)) { 5168 psError(PS_ERR_UNKNOWN, false, "failed to add item hostname"); 5135 5169 psFree(md); 5136 5170 return false; … … 5164 5198 bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object) 5165 5199 { 5166 return rawImfileInsert(dbh, object->exp_id, object->exp_name, object->camera, object->telescope, object->dateobs, object->tmp_class_id, object->class_id, object->uri, object->exp_type, object->filelevel, object->filter, object->comment, object->airmass, object->ra, object->decl, object->exp_time, object->sat_pixel_frac, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->m1_x, object->m1_y, object->m1_z, object->m1_tip, object->m1_tilt, object->m2_x, object->m2_y, object->m2_z, object->m2_tip, object->m2_tilt, object->env_temperature, object->env_humidity, object->env_wind_speed, object->env_wind_dir, object->teltemp_m1, object->teltemp_m1cell, object->teltemp_m2, object->teltemp_spider, object->teltemp_truss, object->teltemp_extra, object->pon_time, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->object, object-> fault);5200 return rawImfileInsert(dbh, object->exp_id, object->exp_name, object->camera, object->telescope, object->dateobs, object->tmp_class_id, object->class_id, object->uri, object->exp_type, object->filelevel, object->filter, object->comment, object->airmass, object->ra, object->decl, object->exp_time, object->sat_pixel_frac, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->m1_x, object->m1_y, object->m1_z, object->m1_tip, object->m1_tilt, object->m2_x, object->m2_y, object->m2_z, object->m2_tip, object->m2_tilt, object->env_temperature, object->env_humidity, object->env_wind_speed, object->env_wind_dir, object->teltemp_m1, object->teltemp_m1cell, object->teltemp_m2, object->teltemp_spider, object->teltemp_truss, object->teltemp_extra, object->pon_time, object->user_1, object->user_2, object->user_3, object->user_4, object->user_5, object->object, object->hostname, object->fault); 5167 5201 } 5168 5202 … … 5492 5526 return false; 5493 5527 } 5528 if (!psMetadataAdd(md, PS_LIST_TAIL, "hostname", PS_DATA_STRING, NULL, object->hostname)) { 5529 psError(PS_ERR_UNKNOWN, false, "failed to add item hostname"); 5530 psFree(md); 5531 return false; 5532 } 5494 5533 if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) { 5495 5534 psError(PS_ERR_UNKNOWN, false, "failed to add item fault"); … … 5761 5800 return false; 5762 5801 } 5802 char* hostname = psMetadataLookupPtr(&status, md, "hostname"); 5803 if (!status) { 5804 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item hostname"); 5805 return false; 5806 } 5763 5807 psS16 fault = psMetadataLookupS16(&status, md, "fault"); 5764 5808 if (!status) { … … 5767 5811 } 5768 5812 5769 return rawImfileRowAlloc(exp_id, exp_name, camera, telescope, dateobs, tmp_class_id, class_id, uri, exp_type, filelevel, filter, comment, airmass, ra, decl, exp_time, sat_pixel_frac, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, m1_x, m1_y, m1_z, m1_tip, m1_tilt, m2_x, m2_y, m2_z, m2_tip, m2_tilt, env_temperature, env_humidity, env_wind_speed, env_wind_dir, teltemp_m1, teltemp_m1cell, teltemp_m2, teltemp_spider, teltemp_truss, teltemp_extra, pon_time, user_1, user_2, user_3, user_4, user_5, object, fault);5813 return rawImfileRowAlloc(exp_id, exp_name, camera, telescope, dateobs, tmp_class_id, class_id, uri, exp_type, filelevel, filter, comment, airmass, ra, decl, exp_time, sat_pixel_frac, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, m1_x, m1_y, m1_z, m1_tip, m1_tilt, m2_x, m2_y, m2_z, m2_tip, m2_tilt, env_temperature, env_humidity, env_wind_speed, env_wind_dir, teltemp_m1, teltemp_m1cell, teltemp_m2, teltemp_spider, teltemp_truss, teltemp_extra, pon_time, user_1, user_2, user_3, user_4, user_5, object, hostname, fault); 5770 5814 } 5771 5815 psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 10431 10475 static void warpSkyfileRowFree(warpSkyfileRow *object); 10432 10476 10433 warpSkyfileRow *warpSkyfileRowAlloc(psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psF32 dtime_warp, const char *hostname, psF32 good_frac, bool ignored, psS16 fault)10477 warpSkyfileRow *warpSkyfileRowAlloc(psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psF32 dtime_warp, const char *hostname, psF32 good_frac, psS32 xmin, psS32 xmax, psS32 ymin, psS32 ymax, bool ignored, psS16 fault) 10434 10478 { 10435 10479 warpSkyfileRow *_object; … … 10448 10492 _object->hostname = psStringCopy(hostname); 10449 10493 _object->good_frac = good_frac; 10494 _object->xmin = xmin; 10495 _object->xmax = xmax; 10496 _object->ymin = ymin; 10497 _object->ymax = ymax; 10450 10498 _object->ignored = ignored; 10451 10499 _object->fault = fault; … … 10516 10564 return false; 10517 10565 } 10566 if (!psMetadataAdd(md, PS_LIST_TAIL, "xmin", PS_DATA_S32, NULL, 0)) { 10567 psError(PS_ERR_UNKNOWN, false, "failed to add item xmin"); 10568 psFree(md); 10569 return false; 10570 } 10571 if (!psMetadataAdd(md, PS_LIST_TAIL, "xmax", PS_DATA_S32, NULL, 0)) { 10572 psError(PS_ERR_UNKNOWN, false, "failed to add item xmax"); 10573 psFree(md); 10574 return false; 10575 } 10576 if (!psMetadataAdd(md, PS_LIST_TAIL, "ymin", PS_DATA_S32, NULL, 0)) { 10577 psError(PS_ERR_UNKNOWN, false, "failed to add item ymin"); 10578 psFree(md); 10579 return false; 10580 } 10581 if (!psMetadataAdd(md, PS_LIST_TAIL, "ymax", PS_DATA_S32, NULL, 0)) { 10582 psError(PS_ERR_UNKNOWN, false, "failed to add item ymax"); 10583 psFree(md); 10584 return false; 10585 } 10518 10586 if (!psMetadataAdd(md, PS_LIST_TAIL, "ignored", PS_DATA_BOOL, "Key", 0)) { 10519 10587 psError(PS_ERR_UNKNOWN, false, "failed to add item ignored"); … … 10539 10607 } 10540 10608 10541 bool warpSkyfileInsert(psDB * dbh, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psF32 dtime_warp, const char *hostname, psF32 good_frac, bool ignored, psS16 fault)10609 bool warpSkyfileInsert(psDB * dbh, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psF32 dtime_warp, const char *hostname, psF32 good_frac, psS32 xmin, psS32 xmax, psS32 ymin, psS32 ymax, bool ignored, psS16 fault) 10542 10610 { 10543 10611 psMetadata *md = psMetadataAlloc(); … … 10589 10657 if (!psMetadataAdd(md, PS_LIST_TAIL, "good_frac", PS_DATA_F32, NULL, good_frac)) { 10590 10658 psError(PS_ERR_UNKNOWN, false, "failed to add item good_frac"); 10659 psFree(md); 10660 return false; 10661 } 10662 if (!psMetadataAdd(md, PS_LIST_TAIL, "xmin", PS_DATA_S32, NULL, xmin)) { 10663 psError(PS_ERR_UNKNOWN, false, "failed to add item xmin"); 10664 psFree(md); 10665 return false; 10666 } 10667 if (!psMetadataAdd(md, PS_LIST_TAIL, "xmax", PS_DATA_S32, NULL, xmax)) { 10668 psError(PS_ERR_UNKNOWN, false, "failed to add item xmax"); 10669 psFree(md); 10670 return false; 10671 } 10672 if (!psMetadataAdd(md, PS_LIST_TAIL, "ymin", PS_DATA_S32, NULL, ymin)) { 10673 psError(PS_ERR_UNKNOWN, false, "failed to add item ymin"); 10674 psFree(md); 10675 return false; 10676 } 10677 if (!psMetadataAdd(md, PS_LIST_TAIL, "ymax", PS_DATA_S32, NULL, ymax)) { 10678 psError(PS_ERR_UNKNOWN, false, "failed to add item ymax"); 10591 10679 psFree(md); 10592 10680 return false; … … 10625 10713 bool warpSkyfileInsertObject(psDB *dbh, warpSkyfileRow *object) 10626 10714 { 10627 return warpSkyfileInsert(dbh, object->warp_id, object->skycell_id, object->tess_id, object->uri, object->path_base, object->bg, object->bg_stdev, object->dtime_warp, object->hostname, object->good_frac, object-> ignored, object->fault);10715 return warpSkyfileInsert(dbh, object->warp_id, object->skycell_id, object->tess_id, object->uri, object->path_base, object->bg, object->bg_stdev, object->dtime_warp, object->hostname, object->good_frac, object->xmin, object->xmax, object->ymin, object->ymax, object->ignored, object->fault); 10628 10716 } 10629 10717 … … 10748 10836 return false; 10749 10837 } 10838 if (!psMetadataAdd(md, PS_LIST_TAIL, "xmin", PS_DATA_S32, NULL, object->xmin)) { 10839 psError(PS_ERR_UNKNOWN, false, "failed to add item xmin"); 10840 psFree(md); 10841 return false; 10842 } 10843 if (!psMetadataAdd(md, PS_LIST_TAIL, "xmax", PS_DATA_S32, NULL, object->xmax)) { 10844 psError(PS_ERR_UNKNOWN, false, "failed to add item xmax"); 10845 psFree(md); 10846 return false; 10847 } 10848 if (!psMetadataAdd(md, PS_LIST_TAIL, "ymin", PS_DATA_S32, NULL, object->ymin)) { 10849 psError(PS_ERR_UNKNOWN, false, "failed to add item ymin"); 10850 psFree(md); 10851 return false; 10852 } 10853 if (!psMetadataAdd(md, PS_LIST_TAIL, "ymax", PS_DATA_S32, NULL, object->ymax)) { 10854 psError(PS_ERR_UNKNOWN, false, "failed to add item ymax"); 10855 psFree(md); 10856 return false; 10857 } 10750 10858 if (!psMetadataAdd(md, PS_LIST_TAIL, "ignored", PS_DATA_BOOL, NULL, object->ignored)) { 10751 10859 psError(PS_ERR_UNKNOWN, false, "failed to add item ignored"); … … 10817 10925 return false; 10818 10926 } 10927 psS32 xmin = psMetadataLookupS32(&status, md, "xmin"); 10928 if (!status) { 10929 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item xmin"); 10930 return false; 10931 } 10932 psS32 xmax = psMetadataLookupS32(&status, md, "xmax"); 10933 if (!status) { 10934 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item xmax"); 10935 return false; 10936 } 10937 psS32 ymin = psMetadataLookupS32(&status, md, "ymin"); 10938 if (!status) { 10939 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ymin"); 10940 return false; 10941 } 10942 psS32 ymax = psMetadataLookupS32(&status, md, "ymax"); 10943 if (!status) { 10944 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item ymax"); 10945 return false; 10946 } 10819 10947 bool ignored = psMetadataLookupBool(&status, md, "ignored"); 10820 10948 if (!status) { … … 10828 10956 } 10829 10957 10830 return warpSkyfileRowAlloc(warp_id, skycell_id, tess_id, uri, path_base, bg, bg_stdev, dtime_warp, hostname, good_frac, ignored, fault);10958 return warpSkyfileRowAlloc(warp_id, skycell_id, tess_id, uri, path_base, bg, bg_stdev, dtime_warp, hostname, good_frac, xmin, xmax, ymin, ymax, ignored, fault); 10831 10959 } 10832 10960 psArray *warpSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 12045 12173 static void diffSkyfileRowFree(diffSkyfileRow *object); 12046 12174 12047 diffSkyfileRow *diffSkyfileRowAlloc(psS64 diff_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, ps F32 dtime_diff, const char *hostname, psF32 good_frac, psS16 fault)12175 diffSkyfileRow *diffSkyfileRowAlloc(psS64 diff_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psS32 stamps_num, psF32 stamps_rms, psS32 sources, psF32 dtime_diff, const char *hostname, psF32 good_frac, psS16 fault) 12048 12176 { 12049 12177 diffSkyfileRow *_object; … … 12057 12185 _object->bg = bg; 12058 12186 _object->bg_stdev = bg_stdev; 12187 _object->stamps_num = stamps_num; 12188 _object->stamps_rms = stamps_rms; 12189 _object->sources = sources; 12059 12190 _object->dtime_diff = dtime_diff; 12060 12191 _object->hostname = psStringCopy(hostname); … … 12100 12231 return false; 12101 12232 } 12233 if (!psMetadataAdd(md, PS_LIST_TAIL, "stamps_num", PS_DATA_S32, NULL, 0)) { 12234 psError(PS_ERR_UNKNOWN, false, "failed to add item stamps_num"); 12235 psFree(md); 12236 return false; 12237 } 12238 if (!psMetadataAdd(md, PS_LIST_TAIL, "stamps_rms", PS_DATA_F32, NULL, 0.0)) { 12239 psError(PS_ERR_UNKNOWN, false, "failed to add item stamps_rms"); 12240 psFree(md); 12241 return false; 12242 } 12243 if (!psMetadataAdd(md, PS_LIST_TAIL, "sources", PS_DATA_S32, NULL, 0)) { 12244 psError(PS_ERR_UNKNOWN, false, "failed to add item sources"); 12245 psFree(md); 12246 return false; 12247 } 12102 12248 if (!psMetadataAdd(md, PS_LIST_TAIL, "dtime_diff", PS_DATA_F32, NULL, 0.0)) { 12103 12249 psError(PS_ERR_UNKNOWN, false, "failed to add item dtime_diff"); … … 12133 12279 } 12134 12280 12135 bool diffSkyfileInsert(psDB * dbh, psS64 diff_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, ps F32 dtime_diff, const char *hostname, psF32 good_frac, psS16 fault)12281 bool diffSkyfileInsert(psDB * dbh, psS64 diff_id, const char *uri, const char *path_base, psF64 bg, psF64 bg_stdev, psS32 stamps_num, psF32 stamps_rms, psS32 sources, psF32 dtime_diff, const char *hostname, psF32 good_frac, psS16 fault) 12136 12282 { 12137 12283 psMetadata *md = psMetadataAlloc(); … … 12158 12304 if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_stdev", PS_DATA_F64, NULL, bg_stdev)) { 12159 12305 psError(PS_ERR_UNKNOWN, false, "failed to add item bg_stdev"); 12306 psFree(md); 12307 return false; 12308 } 12309 if (!psMetadataAdd(md, PS_LIST_TAIL, "stamps_num", PS_DATA_S32, NULL, stamps_num)) { 12310 psError(PS_ERR_UNKNOWN, false, "failed to add item stamps_num"); 12311 psFree(md); 12312 return false; 12313 } 12314 if (!psMetadataAdd(md, PS_LIST_TAIL, "stamps_rms", PS_DATA_F32, NULL, stamps_rms)) { 12315 psError(PS_ERR_UNKNOWN, false, "failed to add item stamps_rms"); 12316 psFree(md); 12317 return false; 12318 } 12319 if (!psMetadataAdd(md, PS_LIST_TAIL, "sources", PS_DATA_S32, NULL, sources)) { 12320 psError(PS_ERR_UNKNOWN, false, "failed to add item sources"); 12160 12321 psFree(md); 12161 12322 return false; … … 12204 12365 bool diffSkyfileInsertObject(psDB *dbh, diffSkyfileRow *object) 12205 12366 { 12206 return diffSkyfileInsert(dbh, object->diff_id, object->uri, object->path_base, object->bg, object->bg_stdev, object-> dtime_diff, object->hostname, object->good_frac, object->fault);12367 return diffSkyfileInsert(dbh, object->diff_id, object->uri, object->path_base, object->bg, object->bg_stdev, object->stamps_num, object->stamps_rms, object->sources, object->dtime_diff, object->hostname, object->good_frac, object->fault); 12207 12368 } 12208 12369 … … 12302 12463 return false; 12303 12464 } 12465 if (!psMetadataAdd(md, PS_LIST_TAIL, "stamps_num", PS_DATA_S32, NULL, object->stamps_num)) { 12466 psError(PS_ERR_UNKNOWN, false, "failed to add item stamps_num"); 12467 psFree(md); 12468 return false; 12469 } 12470 if (!psMetadataAdd(md, PS_LIST_TAIL, "stamps_rms", PS_DATA_F32, NULL, object->stamps_rms)) { 12471 psError(PS_ERR_UNKNOWN, false, "failed to add item stamps_rms"); 12472 psFree(md); 12473 return false; 12474 } 12475 if (!psMetadataAdd(md, PS_LIST_TAIL, "sources", PS_DATA_S32, NULL, object->sources)) { 12476 psError(PS_ERR_UNKNOWN, false, "failed to add item sources"); 12477 psFree(md); 12478 return false; 12479 } 12304 12480 if (!psMetadataAdd(md, PS_LIST_TAIL, "dtime_diff", PS_DATA_F32, NULL, object->dtime_diff)) { 12305 12481 psError(PS_ERR_UNKNOWN, false, "failed to add item dtime_diff"); … … 12356 12532 return false; 12357 12533 } 12534 psS32 stamps_num = psMetadataLookupS32(&status, md, "stamps_num"); 12535 if (!status) { 12536 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stamps_num"); 12537 return false; 12538 } 12539 psF32 stamps_rms = psMetadataLookupF32(&status, md, "stamps_rms"); 12540 if (!status) { 12541 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stamps_rms"); 12542 return false; 12543 } 12544 psS32 sources = psMetadataLookupS32(&status, md, "sources"); 12545 if (!status) { 12546 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item sources"); 12547 return false; 12548 } 12358 12549 psF32 dtime_diff = psMetadataLookupF32(&status, md, "dtime_diff"); 12359 12550 if (!status) { … … 12377 12568 } 12378 12569 12379 return diffSkyfileRowAlloc(diff_id, uri, path_base, bg, bg_stdev, dtime_diff, hostname, good_frac, fault);12570 return diffSkyfileRowAlloc(diff_id, uri, path_base, bg, bg_stdev, stamps_num, stamps_rms, sources, dtime_diff, hostname, good_frac, fault); 12380 12571 } 12381 12572 psArray *diffSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Note:
See TracChangeset
for help on using the changeset viewer.
