Changeset 8325 for trunk/ippdb/src/ippdb.c
- Timestamp:
- Aug 14, 2006, 12:32:05 PM (20 years ago)
- File:
-
- 1 edited
-
trunk/ippdb/src/ippdb.c (modified) (18 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippdb/src/ippdb.c
r8319 r8325 8793 8793 static void rawImfileRowFree(rawImfileRow *object); 8794 8794 8795 rawImfileRow *rawImfileRowAlloc(const char *exp_id, const char *class, const char *class_id, const char * exp_type, const char *uri, 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)8795 rawImfileRow *rawImfileRowAlloc(const char *exp_id, 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) 8796 8796 { 8797 8797 rawImfileRow *object; … … 8803 8803 object->class = psStringCopy(class); 8804 8804 object->class_id = psStringCopy(class_id); 8805 object->uri = psStringCopy(uri); 8805 8806 object->exp_type = psStringCopy(exp_type); 8806 object->uri = psStringCopy(uri);8807 8807 object->filter = psStringCopy(filter); 8808 8808 object->airmass = airmass; … … 8826 8826 psFree(object->class); 8827 8827 psFree(object->class_id); 8828 psFree(object->uri); 8828 8829 psFree(object->exp_type); 8829 psFree(object->uri);8830 8830 psFree(object->filter); 8831 8831 } … … 8857 8857 return false; 8858 8858 } 8859 if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "255")) { 8860 psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); 8861 psFree(md); 8862 return false; 8863 } 8859 8864 if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, "64")) { 8860 8865 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); … … 8862 8867 return false; 8863 8868 } 8864 if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, "255")) {8865 psError(PS_ERR_UNKNOWN, false, "failed to add item uri");8866 psFree(md);8867 return false;8868 }8869 8869 if (!psMetadataAddStr(md, PS_LIST_TAIL, "filter", 0, NULL, "255")) { 8870 8870 psError(PS_ERR_UNKNOWN, false, "failed to add item filter"); … … 8940 8940 } 8941 8941 8942 bool rawImfileInsert(psDB * dbh, const char *exp_id, const char *class, const char *class_id, const char * exp_type, const char *uri, 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)8942 bool rawImfileInsert(psDB * dbh, const char *exp_id, 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) 8943 8943 { 8944 8944 psMetadata *md; … … 8961 8961 return false; 8962 8962 } 8963 if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, uri)) { 8964 psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); 8965 psFree(md); 8966 return false; 8967 } 8963 8968 if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, exp_type)) { 8964 8969 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); 8965 psFree(md);8966 return false;8967 }8968 if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, uri)) {8969 psError(PS_ERR_UNKNOWN, false, "failed to add item uri");8970 8970 psFree(md); 8971 8971 return false; … … 9052 9052 return deleted; 9053 9053 } 9054 bool rawImfilePop(psDB *dbh, char **exp_id, char **class, char **class_id, char ** exp_type, char **uri, 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)9054 bool rawImfilePop(psDB *dbh, char **exp_id, 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) 9055 9055 { 9056 9056 psArray *rowSet; … … 9114 9114 return false; 9115 9115 } 9116 *uri = psMetadataLookupPtr(&status, row, "uri"); 9117 if (!status) { 9118 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri"); 9119 psFree(row); 9120 return false; 9121 } 9116 9122 *exp_type = psMetadataLookupPtr(&status, row, "exp_type"); 9117 9123 if (!status) { … … 9120 9126 return false; 9121 9127 } 9122 *uri = psMetadataLookupPtr(&status, row, "uri");9123 if (!status) {9124 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri");9125 psFree(row);9126 return false;9127 }9128 9128 *filter = psMetadataLookupPtr(&status, row, "filter"); 9129 9129 if (!status) { … … 9206 9206 bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object) 9207 9207 { 9208 return rawImfileInsert(dbh, object->exp_id, object->class, object->class_id, object-> exp_type, object->uri, 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);9208 return rawImfileInsert(dbh, object->exp_id, 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); 9209 9209 } 9210 9210 … … 9225 9225 char class[256]; 9226 9226 char class_id[256]; 9227 char uri[256]; 9227 9228 char exp_type[256]; 9228 char uri[256];9229 9229 char filter[256]; 9230 9230 psF32 airmass; … … 9240 9240 psF64 posang; 9241 9241 9242 if (!rawImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)& exp_type, (char **)&uri, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang)) {9242 if (!rawImfilePop(dbh, (char **)&exp_id, (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)) { 9243 9243 psError(PS_ERR_UNKNOWN, false, "failed to pop a database row"); 9244 9244 return NULL; 9245 9245 } 9246 9246 9247 return rawImfileRowAlloc(exp_id, class, class_id, exp_type, uri, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang);9247 return rawImfileRowAlloc(exp_id, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang); 9248 9248 } 9249 9249 … … 9359 9359 return NULL; 9360 9360 } 9361 if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, object->uri)) { 9362 psError(PS_ERR_UNKNOWN, false, "failed to add item uri"); 9363 psFree(md); 9364 return NULL; 9365 } 9361 9366 if (!psMetadataAddStr(md, PS_LIST_TAIL, "exp_type", 0, NULL, object->exp_type)) { 9362 9367 psError(PS_ERR_UNKNOWN, false, "failed to add item exp_type"); 9363 psFree(md);9364 return NULL;9365 }9366 if (!psMetadataAddStr(md, PS_LIST_TAIL, "uri", 0, NULL, object->uri)) {9367 psError(PS_ERR_UNKNOWN, false, "failed to add item uri");9368 9368 psFree(md); 9369 9369 return NULL; … … 9439 9439 char *class; 9440 9440 char *class_id; 9441 char *uri; 9441 9442 char *exp_type; 9442 char *uri;9443 9443 char *filter; 9444 9444 psF32 airmass; … … 9469 9469 return false; 9470 9470 } 9471 uri = psMetadataLookupPtr(&status, md, "uri"); 9472 if (!status) { 9473 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri"); 9474 return false; 9475 } 9471 9476 exp_type = psMetadataLookupPtr(&status, md, "exp_type"); 9472 9477 if (!status) { … … 9474 9479 return false; 9475 9480 } 9476 uri = psMetadataLookupPtr(&status, md, "uri");9477 if (!status) {9478 psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item uri");9479 return false;9480 }9481 9481 filter = psMetadataLookupPtr(&status, md, "filter"); 9482 9482 if (!status) { … … 9540 9540 } 9541 9541 9542 return rawImfileRowAlloc(exp_id, class, class_id, exp_type, uri, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang);9542 return rawImfileRowAlloc(exp_id, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang); 9543 9543 } 9544 9544 psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Note:
See TracChangeset
for help on using the changeset viewer.
