Index: trunk/ippdb/src/ippdb.h =================================================================== --- trunk/ippdb/src/ippdb.h (revision 8543) +++ trunk/ippdb/src/ippdb.h (revision 8665) @@ -1,2 +1,10 @@ +/* + * + * This file was generated by glueforge 0.24 + * + * Do NOT directly edit this file. + * + */ + #ifndef IPPDB_H #define IPPDB_H 1 @@ -4666,43 +4674,41 @@ bool mdcf ///< format as mdconfig or simple ); -/** p2DoneExpRow data structure - * - * Structure for representing a single row of p2DoneExp table data. +/** p2ProcessedExpRow data structure + * + * Structure for representing a single row of p2ProcessedExp table data. */ typedef struct { char *exp_id; - char *recipe; psS32 p1_version; psS32 p2_version; -} p2DoneExpRow; - -/** Creates a new p2DoneExpRow object - * - * @return A new p2DoneExpRow object or NULL on failure. - */ - -p2DoneExpRow *p2DoneExpRowAlloc( +} p2ProcessedExpRow; + +/** Creates a new p2ProcessedExpRow object + * + * @return A new p2ProcessedExpRow object or NULL on failure. + */ + +p2ProcessedExpRow *p2ProcessedExpRowAlloc( const char *exp_id, - const char *recipe, psS32 p1_version, psS32 p2_version ); -/** Creates a new p2DoneExp table - * - * @return true on success - */ - -bool p2DoneExpCreateTable( - psDB *dbh ///< Database handle -); - -/** Deletes a p2DoneExp table - * - * @return true on success - */ - -bool p2DoneExpDropTable( +/** Creates a new p2ProcessedExp table + * + * @return true on success + */ + +bool p2ProcessedExpCreateTable( + psDB *dbh ///< Database handle +); + +/** Deletes a p2ProcessedExp table + * + * @return true on success + */ + +bool p2ProcessedExpDropTable( psDB *dbh ///< Database handle ); @@ -4715,8 +4721,7 @@ */ -bool p2DoneExpInsert( +bool p2ProcessedExpInsert( psDB *dbh, ///< Database handle const char *exp_id, - const char *recipe, psS32 p1_version, psS32 p2_version @@ -4728,5 +4733,5 @@ */ -long long p2DoneExpDelete( +long long p2ProcessedExpDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -4739,13 +4744,12 @@ */ -bool p2DoneExpPop( +bool p2ProcessedExpPop( psDB *dbh, ///< Database handle char **exp_id, - char **recipe, psS32 *p1_version, psS32 *p2_version ); -/** Insert a single p2DoneExpRow object into a table +/** Insert a single p2ProcessedExpRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -4754,10 +4758,10 @@ */ -bool p2DoneExpInsertObject( - psDB *dbh, ///< Database handle - p2DoneExpRow *object ///< p2DoneExpRow object -); - -/** Insert an array of p2DoneExpRow object into a table +bool p2ProcessedExpInsertObject( + psDB *dbh, ///< Database handle + p2ProcessedExpRow *object ///< p2ProcessedExpRow object +); + +/** Insert an array of p2ProcessedExpRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -4766,19 +4770,19 @@ */ -bool p2DoneExpInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p2DoneExpRow objects +bool p2ProcessedExpInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p2ProcessedExpRow objects ); /** Removes the last row from the database and returns it * - * @return A new p2DoneExpRow on success or NULL on failure. - */ - -p2DoneExpRow *p2DoneExpPopObject( - psDB *dbh ///< Database handle -); - -/** Insert data from a binary FITS table p2DoneExpRow into the database + * @return A new p2ProcessedExpRow on success or NULL on failure. + */ + +p2ProcessedExpRow *p2ProcessedExpPopObject( + psDB *dbh ///< Database handle +); + +/** Insert data from a binary FITS table p2ProcessedExpRow into the database * * This function expects a psFits object with a FITS table as the first @@ -4790,5 +4794,5 @@ */ -bool p2DoneExpInsertFits( +bool p2ProcessedExpInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -4803,5 +4807,5 @@ */ -bool p2DoneExpPopFits( +bool p2ProcessedExpPopFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -4819,5 +4823,5 @@ */ -bool p2DoneExpSelectRowsFits( +bool p2ProcessedExpSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -4826,22 +4830,22 @@ ); -/** Convert a p2DoneExpRow into an equivalent psMetadata +/** Convert a p2ProcessedExpRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p2DoneExpMetadataFromObject( - const p2DoneExpRow *object ///< fooRow to convert into a psMetadata +psMetadata *p2ProcessedExpMetadataFromObject( + const p2ProcessedExpRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p2DoneExpRow pointer or NULL on error - */ - -p2DoneExpRow *p2DoneExpObjectFromMetadata( + * @return A p2ProcessedExpRow pointer or NULL on error + */ + +p2ProcessedExpRow *p2ProcessedExpObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p2DoneExpRow objects in a psArray +/** Selects up to limit rows from the database and returns as p2ProcessedExpRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -4850,10 +4854,10 @@ */ -psArray *p2DoneExpSelectRowObjects( - 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 p2DoneExp +psArray *p2ProcessedExpSelectRowObjects( + 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 p2ProcessedExp * * Note that a 'where' search psMetadata is constructed from each object and @@ -4863,7 +4867,7 @@ */ -bool p2DoneExpDeleteObject( - psDB *dbh, ///< Database handle - const p2DoneExpRow *object ///< Object to delete +bool p2ProcessedExpDeleteObject( + psDB *dbh, ///< Database handle + const p2ProcessedExpRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -4875,10 +4879,10 @@ */ -long long p2DoneExpDeleteRowObjects( +long long p2ProcessedExpDeleteRowObjects( 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 p2DoneExpRow objects +/** Formats and prints an array of p2ProcessedExpRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -4888,12 +4892,12 @@ */ -bool p2DoneExpPrintObjects( +bool p2ProcessedExpPrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p2DoneExpRow objects + psArray *objects, ///< An array of p2ProcessedExpRow objects bool mdcf ///< format as mdconfig or simple ); -/** p2DoneImfileRow data structure - * - * Structure for representing a single row of p2DoneImfile table data. +/** p2ProcessedImfileRow data structure + * + * Structure for representing a single row of p2ProcessedImfile table data. */ @@ -4903,37 +4907,47 @@ char *uri; char *recipe; + psF64 bg; + psF64 bg_stdev; + psF64 bg_mean_stdev; + char *b1_uri; + char *b2_uri; psS32 p1_version; psS32 p2_version; -} p2DoneImfileRow; - -/** Creates a new p2DoneImfileRow object - * - * @return A new p2DoneImfileRow object or NULL on failure. - */ - -p2DoneImfileRow *p2DoneImfileRowAlloc( +} p2ProcessedImfileRow; + +/** Creates a new p2ProcessedImfileRow object + * + * @return A new p2ProcessedImfileRow object or NULL on failure. + */ + +p2ProcessedImfileRow *p2ProcessedImfileRowAlloc( const char *exp_id, const char *class_id, const char *uri, const char *recipe, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev, + const char *b1_uri, + const char *b2_uri, psS32 p1_version, psS32 p2_version ); -/** Creates a new p2DoneImfile table - * - * @return true on success - */ - -bool p2DoneImfileCreateTable( - psDB *dbh ///< Database handle -); - -/** Deletes a p2DoneImfile table - * - * @return true on success - */ - -bool p2DoneImfileDropTable( +/** Creates a new p2ProcessedImfile table + * + * @return true on success + */ + +bool p2ProcessedImfileCreateTable( + psDB *dbh ///< Database handle +); + +/** Deletes a p2ProcessedImfile table + * + * @return true on success + */ + +bool p2ProcessedImfileDropTable( psDB *dbh ///< Database handle ); @@ -4946,5 +4960,5 @@ */ -bool p2DoneImfileInsert( +bool p2ProcessedImfileInsert( psDB *dbh, ///< Database handle const char *exp_id, @@ -4952,4 +4966,9 @@ const char *uri, const char *recipe, + psF64 bg, + psF64 bg_stdev, + psF64 bg_mean_stdev, + const char *b1_uri, + const char *b2_uri, psS32 p1_version, psS32 p2_version @@ -4961,5 +4980,5 @@ */ -long long p2DoneImfileDelete( +long long p2ProcessedImfileDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -4972,5 +4991,5 @@ */ -bool p2DoneImfilePop( +bool p2ProcessedImfilePop( psDB *dbh, ///< Database handle char **exp_id, @@ -4978,9 +4997,14 @@ char **uri, char **recipe, + psF64 *bg, + psF64 *bg_stdev, + psF64 *bg_mean_stdev, + char **b1_uri, + char **b2_uri, psS32 *p1_version, psS32 *p2_version ); -/** Insert a single p2DoneImfileRow object into a table +/** Insert a single p2ProcessedImfileRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -4989,10 +5013,10 @@ */ -bool p2DoneImfileInsertObject( - psDB *dbh, ///< Database handle - p2DoneImfileRow *object ///< p2DoneImfileRow object -); - -/** Insert an array of p2DoneImfileRow object into a table +bool p2ProcessedImfileInsertObject( + psDB *dbh, ///< Database handle + p2ProcessedImfileRow *object ///< p2ProcessedImfileRow object +); + +/** Insert an array of p2ProcessedImfileRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -5001,19 +5025,19 @@ */ -bool p2DoneImfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p2DoneImfileRow objects +bool p2ProcessedImfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p2ProcessedImfileRow objects ); /** Removes the last row from the database and returns it * - * @return A new p2DoneImfileRow on success or NULL on failure. - */ - -p2DoneImfileRow *p2DoneImfilePopObject( - psDB *dbh ///< Database handle -); - -/** Insert data from a binary FITS table p2DoneImfileRow into the database + * @return A new p2ProcessedImfileRow on success or NULL on failure. + */ + +p2ProcessedImfileRow *p2ProcessedImfilePopObject( + psDB *dbh ///< Database handle +); + +/** Insert data from a binary FITS table p2ProcessedImfileRow into the database * * This function expects a psFits object with a FITS table as the first @@ -5025,5 +5049,5 @@ */ -bool p2DoneImfileInsertFits( +bool p2ProcessedImfileInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -5038,5 +5062,5 @@ */ -bool p2DoneImfilePopFits( +bool p2ProcessedImfilePopFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -5054,5 +5078,5 @@ */ -bool p2DoneImfileSelectRowsFits( +bool p2ProcessedImfileSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -5061,22 +5085,22 @@ ); -/** Convert a p2DoneImfileRow into an equivalent psMetadata +/** Convert a p2ProcessedImfileRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p2DoneImfileMetadataFromObject( - const p2DoneImfileRow *object ///< fooRow to convert into a psMetadata +psMetadata *p2ProcessedImfileMetadataFromObject( + const p2ProcessedImfileRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p2DoneImfileRow pointer or NULL on error - */ - -p2DoneImfileRow *p2DoneImfileObjectFromMetadata( + * @return A p2ProcessedImfileRow pointer or NULL on error + */ + +p2ProcessedImfileRow *p2ProcessedImfileObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p2DoneImfileRow objects in a psArray +/** Selects up to limit rows from the database and returns as p2ProcessedImfileRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -5085,10 +5109,10 @@ */ -psArray *p2DoneImfileSelectRowObjects( - 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 p2DoneImfile +psArray *p2ProcessedImfileSelectRowObjects( + 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 p2ProcessedImfile * * Note that a 'where' search psMetadata is constructed from each object and @@ -5098,7 +5122,7 @@ */ -bool p2DoneImfileDeleteObject( - psDB *dbh, ///< Database handle - const p2DoneImfileRow *object ///< Object to delete +bool p2ProcessedImfileDeleteObject( + psDB *dbh, ///< Database handle + const p2ProcessedImfileRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -5110,10 +5134,10 @@ */ -long long p2DoneImfileDeleteRowObjects( +long long p2ProcessedImfileDeleteRowObjects( 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 p2DoneImfileRow objects +/** Formats and prints an array of p2ProcessedImfileRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -5123,7 +5147,7 @@ */ -bool p2DoneImfilePrintObjects( +bool p2ProcessedImfilePrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p2DoneImfileRow objects + psArray *objects, ///< An array of p2ProcessedImfileRow objects bool mdcf ///< format as mdconfig or simple ); @@ -5135,5 +5159,4 @@ typedef struct { char *exp_id; - char *recipe; psS32 p2_version; psS32 p3_version; @@ -5147,5 +5170,4 @@ p3PendingExpRow *p3PendingExpRowAlloc( const char *exp_id, - const char *recipe, psS32 p2_version, psS32 p3_version @@ -5180,5 +5202,4 @@ psDB *dbh, ///< Database handle const char *exp_id, - const char *recipe, psS32 p2_version, psS32 p3_version @@ -5204,5 +5225,4 @@ psDB *dbh, ///< Database handle char **exp_id, - char **recipe, psS32 *p2_version, psS32 *p3_version