Index: trunk/ippdb/src/ippdb.h =================================================================== --- trunk/ippdb/src/ippdb.h (revision 11030) +++ trunk/ippdb/src/ippdb.h (revision 11045) @@ -1590,5 +1590,4 @@ char *exp_type; psS32 imfiles; - psS16 fault; } newExpRow; @@ -1605,6 +1604,5 @@ psTime* dateobs, const char *exp_type, - psS32 imfiles, - psS16 fault + psS32 imfiles ); @@ -1642,6 +1640,5 @@ psTime* dateobs, const char *exp_type, - psS32 imfiles, - psS16 fault + psS32 imfiles ); @@ -1803,5 +1800,4 @@ char *class_id; char *uri; - psS16 fault; } newImfileRow; @@ -1815,6 +1811,5 @@ const char *class, const char *class_id, - const char *uri, - psS16 fault + const char *uri ); @@ -1849,6 +1844,5 @@ const char *class, const char *class_id, - const char *uri, - psS16 fault + const char *uri ); @@ -2000,7 +1994,7 @@ bool mdcf ///< format as mdconfig or simple ); -/** rawDetrendExpRow data structure - * - * Structure for representing a single row of rawDetrendExp table data. +/** rawExpRow data structure + * + * Structure for representing a single row of rawExp table data. */ @@ -2025,12 +2019,13 @@ char *object; psTime* dateobs; -} rawDetrendExpRow; - -/** Creates a new rawDetrendExpRow object - * - * @return A new rawDetrendExpRow object or NULL on failure. - */ - -rawDetrendExpRow *rawDetrendExpRowAlloc( + psS16 fault; +} rawExpRow; + +/** Creates a new rawExpRow object + * + * @return A new rawExpRow object or NULL on failure. + */ + +rawExpRow *rawExpRowAlloc( const char *exp_tag, const char *camera, @@ -2051,22 +2046,23 @@ psF64 posang, const char *object, - psTime* dateobs -); - -/** Creates a new rawDetrendExp table - * - * @return true on success - */ - -bool rawDetrendExpCreateTable( + psTime* dateobs, + psS16 fault +); + +/** Creates a new rawExp table + * + * @return true on success + */ + +bool rawExpCreateTable( psDB *dbh ///< Database handle ); -/** Deletes a rawDetrendExp table - * - * @return true on success - */ - -bool rawDetrendExpDropTable( +/** Deletes a rawExp table + * + * @return true on success + */ + +bool rawExpDropTable( psDB *dbh ///< Database handle ); @@ -2079,5 +2075,5 @@ */ -bool rawDetrendExpInsert( +bool rawExpInsert( psDB *dbh, ///< Database handle const char *exp_tag, @@ -2099,5 +2095,6 @@ psF64 posang, const char *object, - psTime* dateobs + psTime* dateobs, + psS16 fault ); @@ -2107,5 +2104,5 @@ */ -long long rawDetrendExpDelete( +long long rawExpDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -2113,5 +2110,5 @@ ); -/** Insert a single rawDetrendExpRow object into a table +/** Insert a single rawExpRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -2120,10 +2117,10 @@ */ -bool rawDetrendExpInsertObject( - psDB *dbh, ///< Database handle - rawDetrendExpRow *object ///< rawDetrendExpRow object -); - -/** Insert an array of rawDetrendExpRow object into a table +bool rawExpInsertObject( + psDB *dbh, ///< Database handle + rawExpRow *object ///< rawExpRow object +); + +/** Insert an array of rawExpRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -2132,10 +2129,10 @@ */ -bool rawDetrendExpInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of rawDetrendExpRow objects -); - -/** Insert data from a binary FITS table rawDetrendExpRow into the database +bool rawExpInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of rawExpRow objects +); + +/** Insert data from a binary FITS table rawExpRow into the database * * This function expects a psFits object with a FITS table as the first @@ -2147,5 +2144,5 @@ */ -bool rawDetrendExpInsertFits( +bool rawExpInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -2162,5 +2159,5 @@ */ -bool rawDetrendExpSelectRowsFits( +bool rawExpSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -2169,22 +2166,22 @@ ); -/** Convert a rawDetrendExpRow into an equivalent psMetadata +/** Convert a rawExpRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *rawDetrendExpMetadataFromObject( - const rawDetrendExpRow *object ///< fooRow to convert into a psMetadata +psMetadata *rawExpMetadataFromObject( + const rawExpRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A rawDetrendExpRow pointer or NULL on error - */ - -rawDetrendExpRow *rawDetrendExpObjectFromMetadata( + * @return A rawExpRow pointer or NULL on error + */ + +rawExpRow *rawExpObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as rawDetrendExpRow objects in a psArray +/** Selects up to limit rows from the database and returns as rawExpRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -2193,10 +2190,10 @@ */ -psArray *rawDetrendExpSelectRowObjects( +psArray *rawExpSelectRowObjects( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria unsigned long long limit ///< Maximum number of elements to return ); -/** Deletes a row from the database coresponding to an rawDetrendExp +/** Deletes a row from the database coresponding to an rawExp * * Note that a 'where' search psMetadata is constructed from each object and @@ -2206,7 +2203,7 @@ */ -bool rawDetrendExpDeleteObject( - psDB *dbh, ///< Database handle - const rawDetrendExpRow *object ///< Object to delete +bool rawExpDeleteObject( + psDB *dbh, ///< Database handle + const rawExpRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -2218,10 +2215,10 @@ */ -long long rawDetrendExpDeleteRowObjects( +long long rawExpDeleteRowObjects( psDB *dbh, ///< Database handle const psArray *objects, ///< Array of objects to delete unsigned long long limit ///< Maximum number of elements to delete ); -/** Formats and prints an array of rawDetrendExpRow objects +/** Formats and prints an array of rawExpRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -2231,10 +2228,10 @@ */ -bool rawDetrendExpPrintObjects( +bool rawExpPrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of rawDetrendExpRow objects + psArray *objects, ///< An array of rawExpRow objects bool mdcf ///< format as mdconfig or simple ); -/** Formats and prints an rawDetrendExpRow object +/** Formats and prints an rawExpRow object * * When mdcf is set the formated output is in psMetadataConfig @@ -2244,256 +2241,7 @@ */ -bool rawDetrendExpPrintObject( +bool rawExpPrintObject( FILE *stream, ///< a stream - rawDetrendExpRow *object, ///< an rawDetrendExpRow object - bool mdcf ///< format as mdconfig or simple -); -/** rawScienceExpRow data structure - * - * Structure for representing a single row of rawScienceExp table data. - */ - -typedef struct { - 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; - psTime* dateobs; -} rawScienceExpRow; - -/** Creates a new rawScienceExpRow object - * - * @return A new rawScienceExpRow object or NULL on failure. - */ - -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, - psTime* dateobs -); - -/** Creates a new rawScienceExp table - * - * @return true on success - */ - -bool rawScienceExpCreateTable( - psDB *dbh ///< Database handle -); - -/** Deletes a rawScienceExp table - * - * @return true on success - */ - -bool rawScienceExpDropTable( - psDB *dbh ///< Database handle -); - -/** Insert a single row into a table - * - * This function constructs and inserts a single row based on it's parameters. - * - * @return true on success - */ - -bool rawScienceExpInsert( - psDB *dbh, ///< Database handle - 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, - psTime* dateobs -); - -/** Deletes up to limit rows from the database and returns the number of rows actually deleted. - * - * @return A The number of rows removed or a negative value on error - */ - -long long rawScienceExpDelete( - psDB *dbh, ///< Database handle - const psMetadata *where, ///< Row match criteria - unsigned long long limit ///< Maximum number of elements to delete -); - -/** Insert a single rawScienceExpRow object into a table - * - * This function constructs and inserts a single row based on it's parameters. - * - * @return true on success - */ - -bool rawScienceExpInsertObject( - psDB *dbh, ///< Database handle - rawScienceExpRow *object ///< rawScienceExpRow object -); - -/** Insert an array of rawScienceExpRow object into a table - * - * This function constructs and inserts multiple rows based on it's parameters. - * - * @return true on success - */ - -bool rawScienceExpInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of rawScienceExpRow objects -); - -/** Insert data from a binary FITS table rawScienceExpRow into the database - * - * This function expects a psFits object with a FITS table as the first - * extension. The table must have at least one row of data in it, that is of - * the appropriate format (number of columns and their type). All other - * extensions are ignored. - * - * @return true on success - */ - -bool rawScienceExpInsertFits( - psDB *dbh, ///< Database handle - const psFits *fits ///< psFits object -); - -/** Selects up to limit from the database and returns them in a binary FITS table - * - * This function assumes an empty psFits object and will create a FITS table - * as the first extension. - * - * See psDBSelectRows() for documentation on the format of where. - * - * @return true on success - */ - -bool rawScienceExpSelectRowsFits( - psDB *dbh, ///< Database handle - psFits *fits, ///< psFits object - const psMetadata *where, ///< Row match criteria - unsigned long long limit ///< Maximum number of elements to return -); - -/** Convert a rawScienceExpRow into an equivalent psMetadata - * - * @return A psMetadata pointer or NULL on error - */ - -psMetadata *rawScienceExpMetadataFromObject( - const rawScienceExpRow *object ///< fooRow to convert into a psMetadata -); - -/** Convert a psMetadata into an equivalent fooRow - * - * @return A rawScienceExpRow pointer or NULL on error - */ - -rawScienceExpRow *rawScienceExpObjectFromMetadata( - psMetadata *md ///< psMetadata to convert into a fooRow -); -/** Selects up to limit rows from the database and returns as rawScienceExpRow objects in a psArray - * - * See psDBSelectRows() for documentation on the format of where. - * - * @return A psArray pointer or NULL on error - */ - -psArray *rawScienceExpSelectRowObjects( - psDB *dbh, ///< Database handle - const psMetadata *where, ///< Row match criteria - unsigned long long limit ///< Maximum number of elements to return -); -/** Deletes a row from the database coresponding to an rawScienceExp - * - * Note that a 'where' search psMetadata is constructed from each object and - * used to find rows to delete. - * - * @return A The number of rows removed or a negative value on error - */ - -bool rawScienceExpDeleteObject( - psDB *dbh, ///< Database handle - const rawScienceExpRow *object ///< Object to delete -); -/** Deletes up to limit rows from the database and returns the number of rows actually deleted. - * - * Note that a 'where' search psMetadata is constructed from each object and - * used to find rows to delete. - * - * @return A The number of rows removed or a negative value on error - */ - -long long rawScienceExpDeleteRowObjects( - psDB *dbh, ///< Database handle - const psArray *objects, ///< Array of objects to delete - unsigned long long limit ///< Maximum number of elements to delete -); -/** Formats and prints an array of rawScienceExpRow objects - * - * When mdcf is set the formated output is in psMetadataConfig - * format, otherwise it is in a simple tabular format. - * - * @return true on success - */ - -bool rawScienceExpPrintObjects( - FILE *stream, ///< a stream - psArray *objects, ///< An array of rawScienceExpRow objects - bool mdcf ///< format as mdconfig or simple -); -/** Formats and prints an rawScienceExpRow object - * - * When mdcf is set the formated output is in psMetadataConfig - * format, otherwise it is in a simple tabular format. - * - * @return true on success - */ - -bool rawScienceExpPrintObject( - FILE *stream, ///< a stream - rawScienceExpRow *object, ///< an rawScienceExpRow object + rawExpRow *object, ///< an rawExpRow object bool mdcf ///< format as mdconfig or simple ); @@ -2523,4 +2271,5 @@ char *object; psTime* dateobs; + psS16 fault; } rawImfileRow; @@ -2549,5 +2298,6 @@ psF64 posang, const char *object, - psTime* dateobs + psTime* dateobs, + psS16 fault ); @@ -2597,5 +2347,6 @@ psF64 posang, const char *object, - psTime* dateobs + psTime* dateobs, + psS16 fault );