Changeset 8089 for branches/jhoblitt/ippdb/src/ippdb.c
- Timestamp:
- Aug 2, 2006, 4:40:35 PM (20 years ago)
- File:
-
- 1 edited
-
branches/jhoblitt/ippdb/src/ippdb.c (modified) (30 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/jhoblitt/ippdb/src/ippdb.c
r8084 r8089 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, const char *class,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 dec, psF32 exp_time, psF64 background) 5964 5964 { 5965 5965 rawDetrendExpRow *object; … … 5974 5974 object->imfiles = imfiles; 5975 5975 object->filter = psStringCopy(filter); 5976 object->class = psStringCopy(class);5977 5976 object->airmass = airmass; 5978 5977 object->ra = ra; … … 5991 5990 psFree(object->exp_type); 5992 5991 psFree(object->filter); 5993 psFree(object->class);5994 5992 } 5995 5993 … … 6035 6033 return false; 6036 6034 } 6037 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) {6038 psError(PS_ERR_UNKNOWN, false, "failed to add item class");6039 psFree(md);6040 return false;6041 }6042 6035 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { 6043 6036 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 6078 6071 } 6079 6072 6080 bool rawDetrendExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class,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 dec, psF32 exp_time, psF64 background) 6081 6074 { 6082 6075 psMetadata *md; … … 6114 6107 return false; 6115 6108 } 6116 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {6117 psError(PS_ERR_UNKNOWN, false, "failed to add item class");6118 psFree(md);6119 return false;6120 }6121 6109 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { 6122 6110 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 6151 6139 } 6152 6140 6153 bool rawDetrendExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class,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 *dec, psF32 *exp_time, psF64 *background) 6154 6142 { 6155 6143 psArray *rowSet; … … 6231 6219 return false; 6232 6220 } 6233 *class = psMetadataLookupPtr(&status, row, "class");6234 if (!status) {6235 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");6236 psFree(row);6237 return false;6238 }6239 6221 *airmass = psMetadataLookupF32(&status, row, "airmass"); 6240 6222 if (!status) { … … 6275 6257 bool rawDetrendExpInsertObject(psDB *dbh, rawDetrendExpRow *object) 6276 6258 { 6277 return rawDetrendExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object-> class, 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->dec, object->exp_time, object->background); 6278 6260 } 6279 6261 … … 6286 6268 psS32 imfiles; 6287 6269 char filter[256]; 6288 char class[256];6289 6270 psF32 airmass; 6290 6271 psF64 ra; … … 6293 6274 psF64 background; 6294 6275 6295 if (!rawDetrendExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class,&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, &dec, &exp_time, &background)) { 6296 6277 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 6297 6278 return NULL; 6298 6279 } 6299 6280 6300 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class,airmass, ra, dec, exp_time, background);6281 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background); 6301 6282 } 6302 6283 … … 6427 6408 return NULL; 6428 6409 } 6429 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {6430 psError(PS_ERR_UNKNOWN, false, "failed to add item class");6431 psFree(md);6432 return NULL;6433 }6434 6410 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { 6435 6411 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 6470 6446 psS32 imfiles; 6471 6447 char *filter; 6472 char *class;6473 6448 psF32 airmass; 6474 6449 psF64 ra; … … 6507 6482 return false; 6508 6483 } 6509 class = psMetadataLookupPtr(&status, md, "class");6510 if (!status) {6511 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");6512 return false;6513 }6514 6484 airmass = psMetadataLookupF32(&status, md, "airmass"); 6515 6485 if (!status) { … … 6538 6508 } 6539 6509 6540 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class,airmass, ra, dec, exp_time, background);6510 return rawDetrendExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background); 6541 6511 } 6542 6512 psArray *rawDetrendExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) … … 6596 6566 static void rawScienceExpRowFree(rawScienceExpRow *object); 6597 6567 6598 rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class,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 dec, psF32 exp_time, psF64 background) 6599 6569 { 6600 6570 rawScienceExpRow *object; … … 6609 6579 object->imfiles = imfiles; 6610 6580 object->filter = psStringCopy(filter); 6611 object->class = psStringCopy(class);6612 6581 object->airmass = airmass; 6613 6582 object->ra = ra; … … 6626 6595 psFree(object->exp_type); 6627 6596 psFree(object->filter); 6628 psFree(object->class);6629 6597 } 6630 6598 … … 6670 6638 return false; 6671 6639 } 6672 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "255")) {6673 psError(PS_ERR_UNKNOWN, false, "failed to add item class");6674 psFree(md);6675 return false;6676 }6677 6640 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, 0.0)) { 6678 6641 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 6713 6676 } 6714 6677 6715 bool rawScienceExpInsert(psDB * dbh, const char *exp_id, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, const char *class,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 dec, psF32 exp_time, psF64 background) 6716 6679 { 6717 6680 psMetadata *md; … … 6749 6712 return false; 6750 6713 } 6751 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, class)) {6752 psError(PS_ERR_UNKNOWN, false, "failed to add item class");6753 psFree(md);6754 return false;6755 }6756 6714 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, airmass)) { 6757 6715 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 6786 6744 } 6787 6745 6788 bool rawScienceExpPop(psDB *dbh, char **exp_id, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, char **class,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 *dec, psF32 *exp_time, psF64 *background) 6789 6747 { 6790 6748 psArray *rowSet; … … 6866 6824 return false; 6867 6825 } 6868 *class = psMetadataLookupPtr(&status, row, "class");6869 if (!status) {6870 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");6871 psFree(row);6872 return false;6873 }6874 6826 *airmass = psMetadataLookupF32(&status, row, "airmass"); 6875 6827 if (!status) { … … 6910 6862 bool rawScienceExpInsertObject(psDB *dbh, rawScienceExpRow *object) 6911 6863 { 6912 return rawScienceExpInsert(dbh, object->exp_id, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object-> class, 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->dec, object->exp_time, object->background); 6913 6865 } 6914 6866 … … 6921 6873 psS32 imfiles; 6922 6874 char filter[256]; 6923 char class[256];6924 6875 psF32 airmass; 6925 6876 psF64 ra; … … 6928 6879 psF64 background; 6929 6880 6930 if (!rawScienceExpPop(dbh, (char **)&exp_id, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, (char **)&class,&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, &dec, &exp_time, &background)) { 6931 6882 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 6932 6883 return NULL; 6933 6884 } 6934 6885 6935 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class,airmass, ra, dec, exp_time, background);6886 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background); 6936 6887 } 6937 6888 … … 7062 7013 return NULL; 7063 7014 } 7064 if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, object->class)) {7065 psError(PS_ERR_UNKNOWN, false, "failed to add item class");7066 psFree(md);7067 return NULL;7068 }7069 7015 if (!psMetadataAddF32(md, PS_LIST_TAIL, "airmass", 0, NULL, object->airmass)) { 7070 7016 psError(PS_ERR_UNKNOWN, false, "failed to add item airmass"); … … 7105 7051 psS32 imfiles; 7106 7052 char *filter; 7107 char *class;7108 7053 psF32 airmass; 7109 7054 psF64 ra; … … 7142 7087 return false; 7143 7088 } 7144 class = psMetadataLookupPtr(&status, md, "class");7145 if (!status) {7146 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");7147 return false;7148 }7149 7089 airmass = psMetadataLookupF32(&status, md, "airmass"); 7150 7090 if (!status) { … … 7173 7113 } 7174 7114 7175 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, class,airmass, ra, dec, exp_time, background);7115 return rawScienceExpRowAlloc(exp_id, camera, telescope, exp_type, imfiles, filter, airmass, ra, dec, exp_time, background); 7176 7116 } 7177 7117 psArray *rawScienceExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Note:
See TracChangeset
for help on using the changeset viewer.
