Index: trunk/ippdb/src/ippdb.h =================================================================== --- trunk/ippdb/src/ippdb.h (revision 10748) +++ trunk/ippdb/src/ippdb.h (revision 10753) @@ -7652,7 +7652,7 @@ bool mdcf ///< format as mdconfig or simple ); -/** p4PStackedImfileRow data structure - * - * Structure for representing a single row of p4PStackedImfile table data. +/** p4StackedImfileRow data structure + * + * Structure for representing a single row of p4StackedImfile table data. */ @@ -7663,12 +7663,12 @@ char *b1_uri; char *b2_uri; -} p4PStackedImfileRow; - -/** Creates a new p4PStackedImfileRow object - * - * @return A new p4PStackedImfileRow object or NULL on failure. - */ - -p4PStackedImfileRow *p4PStackedImfileRowAlloc( +} p4StackedImfileRow; + +/** Creates a new p4StackedImfileRow object + * + * @return A new p4StackedImfileRow object or NULL on failure. + */ + +p4StackedImfileRow *p4StackedImfileRowAlloc( psS32 p4_id, const char *class_id, @@ -7678,19 +7678,19 @@ ); -/** Creates a new p4PStackedImfile table - * - * @return true on success - */ - -bool p4PStackedImfileCreateTable( +/** Creates a new p4StackedImfile table + * + * @return true on success + */ + +bool p4StackedImfileCreateTable( psDB *dbh ///< Database handle ); -/** Deletes a p4PStackedImfile table - * - * @return true on success - */ - -bool p4PStackedImfileDropTable( +/** Deletes a p4StackedImfile table + * + * @return true on success + */ + +bool p4StackedImfileDropTable( psDB *dbh ///< Database handle ); @@ -7703,5 +7703,5 @@ */ -bool p4PStackedImfileInsert( +bool p4StackedImfileInsert( psDB *dbh, ///< Database handle psS32 p4_id, @@ -7717,5 +7717,5 @@ */ -long long p4PStackedImfileDelete( +long long p4StackedImfileDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -7723,5 +7723,5 @@ ); -/** Insert a single p4PStackedImfileRow object into a table +/** Insert a single p4StackedImfileRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -7730,10 +7730,10 @@ */ -bool p4PStackedImfileInsertObject( - psDB *dbh, ///< Database handle - p4PStackedImfileRow *object ///< p4PStackedImfileRow object -); - -/** Insert an array of p4PStackedImfileRow object into a table +bool p4StackedImfileInsertObject( + psDB *dbh, ///< Database handle + p4StackedImfileRow *object ///< p4StackedImfileRow object +); + +/** Insert an array of p4StackedImfileRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -7742,10 +7742,10 @@ */ -bool p4PStackedImfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p4PStackedImfileRow objects -); - -/** Insert data from a binary FITS table p4PStackedImfileRow into the database +bool p4StackedImfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p4StackedImfileRow objects +); + +/** Insert data from a binary FITS table p4StackedImfileRow into the database * * This function expects a psFits object with a FITS table as the first @@ -7757,5 +7757,5 @@ */ -bool p4PStackedImfileInsertFits( +bool p4StackedImfileInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -7772,5 +7772,5 @@ */ -bool p4PStackedImfileSelectRowsFits( +bool p4StackedImfileSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -7779,22 +7779,22 @@ ); -/** Convert a p4PStackedImfileRow into an equivalent psMetadata +/** Convert a p4StackedImfileRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p4PStackedImfileMetadataFromObject( - const p4PStackedImfileRow *object ///< fooRow to convert into a psMetadata +psMetadata *p4StackedImfileMetadataFromObject( + const p4StackedImfileRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p4PStackedImfileRow pointer or NULL on error - */ - -p4PStackedImfileRow *p4PStackedImfileObjectFromMetadata( + * @return A p4StackedImfileRow pointer or NULL on error + */ + +p4StackedImfileRow *p4StackedImfileObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p4PStackedImfileRow objects in a psArray +/** Selects up to limit rows from the database and returns as p4StackedImfileRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -7803,10 +7803,10 @@ */ -psArray *p4PStackedImfileSelectRowObjects( +psArray *p4StackedImfileSelectRowObjects( 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 p4PStackedImfile +/** Deletes a row from the database coresponding to an p4StackedImfile * * Note that a 'where' search psMetadata is constructed from each object and @@ -7816,7 +7816,7 @@ */ -bool p4PStackedImfileDeleteObject( - psDB *dbh, ///< Database handle - const p4PStackedImfileRow *object ///< Object to delete +bool p4StackedImfileDeleteObject( + psDB *dbh, ///< Database handle + const p4StackedImfileRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -7828,10 +7828,10 @@ */ -long long p4PStackedImfileDeleteRowObjects( +long long p4StackedImfileDeleteRowObjects( 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 p4PStackedImfileRow objects +/** Formats and prints an array of p4StackedImfileRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -7841,10 +7841,10 @@ */ -bool p4PStackedImfilePrintObjects( +bool p4StackedImfilePrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p4PStackedImfileRow objects + psArray *objects, ///< An array of p4StackedImfileRow objects bool mdcf ///< format as mdconfig or simple ); -/** Formats and prints an p4PStackedImfileRow object +/** Formats and prints an p4StackedImfileRow object * * When mdcf is set the formated output is in psMetadataConfig @@ -7854,12 +7854,12 @@ */ -bool p4PStackedImfilePrintObject( +bool p4StackedImfilePrintObject( FILE *stream, ///< a stream - p4PStackedImfileRow *object, ///< an p4PStackedImfileRow object + p4StackedImfileRow *object, ///< an p4StackedImfileRow object bool mdcf ///< format as mdconfig or simple ); -/** p4PDiffImfileRow data structure - * - * Structure for representing a single row of p4PDiffImfile table data. +/** p4DiffImfileRow data structure + * + * Structure for representing a single row of p4DiffImfile table data. */ @@ -7872,12 +7872,12 @@ char *b1_uri; char *b2_uri; -} p4PDiffImfileRow; - -/** Creates a new p4PDiffImfileRow object - * - * @return A new p4PDiffImfileRow object or NULL on failure. - */ - -p4PDiffImfileRow *p4PDiffImfileRowAlloc( +} p4DiffImfileRow; + +/** Creates a new p4DiffImfileRow object + * + * @return A new p4DiffImfileRow object or NULL on failure. + */ + +p4DiffImfileRow *p4DiffImfileRowAlloc( psS32 p4_id, const char *exp_tag, @@ -7889,19 +7889,19 @@ ); -/** Creates a new p4PDiffImfile table - * - * @return true on success - */ - -bool p4PDiffImfileCreateTable( +/** Creates a new p4DiffImfile table + * + * @return true on success + */ + +bool p4DiffImfileCreateTable( psDB *dbh ///< Database handle ); -/** Deletes a p4PDiffImfile table - * - * @return true on success - */ - -bool p4PDiffImfileDropTable( +/** Deletes a p4DiffImfile table + * + * @return true on success + */ + +bool p4DiffImfileDropTable( psDB *dbh ///< Database handle ); @@ -7914,5 +7914,5 @@ */ -bool p4PDiffImfileInsert( +bool p4DiffImfileInsert( psDB *dbh, ///< Database handle psS32 p4_id, @@ -7930,5 +7930,5 @@ */ -long long p4PDiffImfileDelete( +long long p4DiffImfileDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -7936,5 +7936,5 @@ ); -/** Insert a single p4PDiffImfileRow object into a table +/** Insert a single p4DiffImfileRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -7943,10 +7943,10 @@ */ -bool p4PDiffImfileInsertObject( - psDB *dbh, ///< Database handle - p4PDiffImfileRow *object ///< p4PDiffImfileRow object -); - -/** Insert an array of p4PDiffImfileRow object into a table +bool p4DiffImfileInsertObject( + psDB *dbh, ///< Database handle + p4DiffImfileRow *object ///< p4DiffImfileRow object +); + +/** Insert an array of p4DiffImfileRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -7955,10 +7955,10 @@ */ -bool p4PDiffImfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p4PDiffImfileRow objects -); - -/** Insert data from a binary FITS table p4PDiffImfileRow into the database +bool p4DiffImfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p4DiffImfileRow objects +); + +/** Insert data from a binary FITS table p4DiffImfileRow into the database * * This function expects a psFits object with a FITS table as the first @@ -7970,5 +7970,5 @@ */ -bool p4PDiffImfileInsertFits( +bool p4DiffImfileInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -7985,5 +7985,5 @@ */ -bool p4PDiffImfileSelectRowsFits( +bool p4DiffImfileSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -7992,22 +7992,22 @@ ); -/** Convert a p4PDiffImfileRow into an equivalent psMetadata +/** Convert a p4DiffImfileRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p4PDiffImfileMetadataFromObject( - const p4PDiffImfileRow *object ///< fooRow to convert into a psMetadata +psMetadata *p4DiffImfileMetadataFromObject( + const p4DiffImfileRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p4PDiffImfileRow pointer or NULL on error - */ - -p4PDiffImfileRow *p4PDiffImfileObjectFromMetadata( + * @return A p4DiffImfileRow pointer or NULL on error + */ + +p4DiffImfileRow *p4DiffImfileObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p4PDiffImfileRow objects in a psArray +/** Selects up to limit rows from the database and returns as p4DiffImfileRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -8016,10 +8016,10 @@ */ -psArray *p4PDiffImfileSelectRowObjects( +psArray *p4DiffImfileSelectRowObjects( 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 p4PDiffImfile +/** Deletes a row from the database coresponding to an p4DiffImfile * * Note that a 'where' search psMetadata is constructed from each object and @@ -8029,7 +8029,7 @@ */ -bool p4PDiffImfileDeleteObject( - psDB *dbh, ///< Database handle - const p4PDiffImfileRow *object ///< Object to delete +bool p4DiffImfileDeleteObject( + psDB *dbh, ///< Database handle + const p4DiffImfileRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -8041,10 +8041,10 @@ */ -long long p4PDiffImfileDeleteRowObjects( +long long p4DiffImfileDeleteRowObjects( 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 p4PDiffImfileRow objects +/** Formats and prints an array of p4DiffImfileRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -8054,10 +8054,10 @@ */ -bool p4PDiffImfilePrintObjects( +bool p4DiffImfilePrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p4PDiffImfileRow objects + psArray *objects, ///< An array of p4DiffImfileRow objects bool mdcf ///< format as mdconfig or simple ); -/** Formats and prints an p4PDiffImfileRow object +/** Formats and prints an p4DiffImfileRow object * * When mdcf is set the formated output is in psMetadataConfig @@ -8067,12 +8067,12 @@ */ -bool p4PDiffImfilePrintObject( +bool p4DiffImfilePrintObject( FILE *stream, ///< a stream - p4PDiffImfileRow *object, ///< an p4PDiffImfileRow object + p4DiffImfileRow *object, ///< an p4DiffImfileRow object bool mdcf ///< format as mdconfig or simple ); -/** p4PMagicMaskImfileRow data structure - * - * Structure for representing a single row of p4PMagicMaskImfile table data. +/** p4MagicMaskImfileRow data structure + * + * Structure for representing a single row of p4MagicMaskImfile table data. */ @@ -8083,12 +8083,12 @@ char *class_id; char *uri; -} p4PMagicMaskImfileRow; - -/** Creates a new p4PMagicMaskImfileRow object - * - * @return A new p4PMagicMaskImfileRow object or NULL on failure. - */ - -p4PMagicMaskImfileRow *p4PMagicMaskImfileRowAlloc( +} p4MagicMaskImfileRow; + +/** Creates a new p4MagicMaskImfileRow object + * + * @return A new p4MagicMaskImfileRow object or NULL on failure. + */ + +p4MagicMaskImfileRow *p4MagicMaskImfileRowAlloc( psS32 p4_id, const char *exp_tag, @@ -8098,19 +8098,19 @@ ); -/** Creates a new p4PMagicMaskImfile table - * - * @return true on success - */ - -bool p4PMagicMaskImfileCreateTable( +/** Creates a new p4MagicMaskImfile table + * + * @return true on success + */ + +bool p4MagicMaskImfileCreateTable( psDB *dbh ///< Database handle ); -/** Deletes a p4PMagicMaskImfile table - * - * @return true on success - */ - -bool p4PMagicMaskImfileDropTable( +/** Deletes a p4MagicMaskImfile table + * + * @return true on success + */ + +bool p4MagicMaskImfileDropTable( psDB *dbh ///< Database handle ); @@ -8123,5 +8123,5 @@ */ -bool p4PMagicMaskImfileInsert( +bool p4MagicMaskImfileInsert( psDB *dbh, ///< Database handle psS32 p4_id, @@ -8137,5 +8137,5 @@ */ -long long p4PMagicMaskImfileDelete( +long long p4MagicMaskImfileDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -8143,5 +8143,5 @@ ); -/** Insert a single p4PMagicMaskImfileRow object into a table +/** Insert a single p4MagicMaskImfileRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -8150,10 +8150,10 @@ */ -bool p4PMagicMaskImfileInsertObject( - psDB *dbh, ///< Database handle - p4PMagicMaskImfileRow *object ///< p4PMagicMaskImfileRow object -); - -/** Insert an array of p4PMagicMaskImfileRow object into a table +bool p4MagicMaskImfileInsertObject( + psDB *dbh, ///< Database handle + p4MagicMaskImfileRow *object ///< p4MagicMaskImfileRow object +); + +/** Insert an array of p4MagicMaskImfileRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -8162,10 +8162,10 @@ */ -bool p4PMagicMaskImfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p4PMagicMaskImfileRow objects -); - -/** Insert data from a binary FITS table p4PMagicMaskImfileRow into the database +bool p4MagicMaskImfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p4MagicMaskImfileRow objects +); + +/** Insert data from a binary FITS table p4MagicMaskImfileRow into the database * * This function expects a psFits object with a FITS table as the first @@ -8177,5 +8177,5 @@ */ -bool p4PMagicMaskImfileInsertFits( +bool p4MagicMaskImfileInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -8192,5 +8192,5 @@ */ -bool p4PMagicMaskImfileSelectRowsFits( +bool p4MagicMaskImfileSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -8199,22 +8199,22 @@ ); -/** Convert a p4PMagicMaskImfileRow into an equivalent psMetadata +/** Convert a p4MagicMaskImfileRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p4PMagicMaskImfileMetadataFromObject( - const p4PMagicMaskImfileRow *object ///< fooRow to convert into a psMetadata +psMetadata *p4MagicMaskImfileMetadataFromObject( + const p4MagicMaskImfileRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p4PMagicMaskImfileRow pointer or NULL on error - */ - -p4PMagicMaskImfileRow *p4PMagicMaskImfileObjectFromMetadata( + * @return A p4MagicMaskImfileRow pointer or NULL on error + */ + +p4MagicMaskImfileRow *p4MagicMaskImfileObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p4PMagicMaskImfileRow objects in a psArray +/** Selects up to limit rows from the database and returns as p4MagicMaskImfileRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -8223,10 +8223,10 @@ */ -psArray *p4PMagicMaskImfileSelectRowObjects( +psArray *p4MagicMaskImfileSelectRowObjects( 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 p4PMagicMaskImfile +/** Deletes a row from the database coresponding to an p4MagicMaskImfile * * Note that a 'where' search psMetadata is constructed from each object and @@ -8236,7 +8236,7 @@ */ -bool p4PMagicMaskImfileDeleteObject( - psDB *dbh, ///< Database handle - const p4PMagicMaskImfileRow *object ///< Object to delete +bool p4MagicMaskImfileDeleteObject( + psDB *dbh, ///< Database handle + const p4MagicMaskImfileRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -8248,10 +8248,10 @@ */ -long long p4PMagicMaskImfileDeleteRowObjects( +long long p4MagicMaskImfileDeleteRowObjects( 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 p4PMagicMaskImfileRow objects +/** Formats and prints an array of p4MagicMaskImfileRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -8261,10 +8261,10 @@ */ -bool p4PMagicMaskImfilePrintObjects( +bool p4MagicMaskImfilePrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p4PMagicMaskImfileRow objects + psArray *objects, ///< An array of p4MagicMaskImfileRow objects bool mdcf ///< format as mdconfig or simple ); -/** Formats and prints an p4PMagicMaskImfileRow object +/** Formats and prints an p4MagicMaskImfileRow object * * When mdcf is set the formated output is in psMetadataConfig @@ -8274,7 +8274,7 @@ */ -bool p4PMagicMaskImfilePrintObject( +bool p4MagicMaskImfilePrintObject( FILE *stream, ///< a stream - p4PMagicMaskImfileRow *object, ///< an p4PMagicMaskImfileRow object + p4MagicMaskImfileRow *object, ///< an p4MagicMaskImfileRow object bool mdcf ///< format as mdconfig or simple ); @@ -8286,3 +8286,3 @@ #endif -#endif // P4PMAGICMASKIMFILE_DB_H +#endif // P4MAGICMASKIMFILE_DB_H