Index: /trunk/ippdb/Makefile.am =================================================================== --- /trunk/ippdb/Makefile.am (revision 10747) +++ /trunk/ippdb/Makefile.am (revision 10748) @@ -44,5 +44,5 @@ $(top_builddir)/docs/man/man3/p4RunRow.3 \ $(top_builddir)/docs/man/man3/p4InputImfileRow.3 \ - $(top_builddir)/docs/man/man3/p4PWarpedImfileRow.3 \ + $(top_builddir)/docs/man/man3/p4WarpedImfileRow.3 \ $(top_builddir)/docs/man/man3/p4PStackedImfileRow.3 \ $(top_builddir)/docs/man/man3/p4PDiffImfileRow.3 \ @@ -50,5 +50,5 @@ -docs/man/man3/ippdb.3 docs/man/man3/expTagCounterRow.3 docs/man/man3/summitExpRow.3 docs/man/man3/summitImfileRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/pzDoneExpRow.3 docs/man/man3/pzDoneImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawDetrendExpRow.3 docs/man/man3/rawScienceExpRow.3 docs/man/man3/rawImfileRow.3 docs/man/man3/p1PendingExpRow.3 docs/man/man3/p2PendingExpRow.3 docs/man/man3/p2PendingImfileRow.3 docs/man/man3/p2ProcessedExpRow.3 docs/man/man3/p2MaskRow.3 docs/man/man3/p2ProcessedImfileRow.3 docs/man/man3/p3PendingExpRow.3 docs/man/man3/p3ProcessedExpRow.3 docs/man/man3/p3MaskRow.3 docs/man/man3/detRunRow.3 docs/man/man3/detInputExpRow.3 docs/man/man3/detProcessedImfileRow.3 docs/man/man3/detProcessedExpRow.3 docs/man/man3/detStackedImfileRow.3 docs/man/man3/detNormalizedStatImfileRow.3 docs/man/man3/detNormalizedImfileRow.3 docs/man/man3/detNormalizedExpRow.3 docs/man/man3/detResidImfileRow.3 docs/man/man3/detResidExpRow.3 docs/man/man3/detRunSummaryRow.3 docs/man/man3/p4RunRow.3 docs/man/man3/p4InputImfileRow.3 docs/man/man3/p4PWarpedImfileRow.3 docs/man/man3/p4PStackedImfileRow.3 docs/man/man3/p4PDiffImfileRow.3 docs/man/man3/p4PMagicMaskImfileRow.3: +docs/man/man3/ippdb.3 docs/man/man3/expTagCounterRow.3 docs/man/man3/summitExpRow.3 docs/man/man3/summitImfileRow.3 docs/man/man3/pzPendingExpRow.3 docs/man/man3/pzPendingImfileRow.3 docs/man/man3/pzDoneExpRow.3 docs/man/man3/pzDoneImfileRow.3 docs/man/man3/newExpRow.3 docs/man/man3/newImfileRow.3 docs/man/man3/rawDetrendExpRow.3 docs/man/man3/rawScienceExpRow.3 docs/man/man3/rawImfileRow.3 docs/man/man3/p1PendingExpRow.3 docs/man/man3/p2PendingExpRow.3 docs/man/man3/p2PendingImfileRow.3 docs/man/man3/p2ProcessedExpRow.3 docs/man/man3/p2MaskRow.3 docs/man/man3/p2ProcessedImfileRow.3 docs/man/man3/p3PendingExpRow.3 docs/man/man3/p3ProcessedExpRow.3 docs/man/man3/p3MaskRow.3 docs/man/man3/detRunRow.3 docs/man/man3/detInputExpRow.3 docs/man/man3/detProcessedImfileRow.3 docs/man/man3/detProcessedExpRow.3 docs/man/man3/detStackedImfileRow.3 docs/man/man3/detNormalizedStatImfileRow.3 docs/man/man3/detNormalizedImfileRow.3 docs/man/man3/detNormalizedExpRow.3 docs/man/man3/detResidImfileRow.3 docs/man/man3/detResidExpRow.3 docs/man/man3/detRunSummaryRow.3 docs/man/man3/p4RunRow.3 docs/man/man3/p4InputImfileRow.3 docs/man/man3/p4WarpedImfileRow.3 docs/man/man3/p4PStackedImfileRow.3 docs/man/man3/p4PDiffImfileRow.3 docs/man/man3/p4PMagicMaskImfileRow.3: $(DOXYGEN) Index: /trunk/ippdb/configure.ac =================================================================== --- /trunk/ippdb/configure.ac (revision 10747) +++ /trunk/ippdb/configure.ac (revision 10748) @@ -7,5 +7,5 @@ AC_PREREQ(2.59) -AC_INIT([ippdb], [0.0.66], [pan-starrs.ifa.hawaii.edu]) +AC_INIT([ippdb], [0.0.67], [pan-starrs.ifa.hawaii.edu]) AC_CONFIG_SRCDIR([ippdb.pc.in]) Index: /trunk/ippdb/src/ippdb.c =================================================================== --- /trunk/ippdb/src/ippdb.c (revision 10747) +++ /trunk/ippdb/src/ippdb.c (revision 10748) @@ -65,5 +65,5 @@ #define P4RUN_TABLE_NAME "p4Run" #define P4INPUTIMFILE_TABLE_NAME "p4InputImfile" -#define P4PWARPEDIMFILE_TABLE_NAME "p4PWarpedImfile" +#define P4WARPEDIMFILE_TABLE_NAME "p4WarpedImfile" #define P4PSTACKEDIMFILE_TABLE_NAME "p4PStackedImfile" #define P4PDIFFIMFILE_TABLE_NAME "p4PDiffImfile" @@ -14457,12 +14457,12 @@ return true; } -static void p4PWarpedImfileRowFree(p4PWarpedImfileRow *object); - -p4PWarpedImfileRow *p4PWarpedImfileRowAlloc(psS32 p4_id, const char *exp_tag, psS32 p3_version, const char *class_id, const char *uri, const char *b1_uri, const char *b2_uri) -{ - p4PWarpedImfileRow *_object; - - _object = psAlloc(sizeof(p4PWarpedImfileRow)); - psMemSetDeallocator(_object, (psFreeFunc)p4PWarpedImfileRowFree); +static void p4WarpedImfileRowFree(p4WarpedImfileRow *object); + +p4WarpedImfileRow *p4WarpedImfileRowAlloc(psS32 p4_id, const char *exp_tag, psS32 p3_version, const char *class_id, const char *uri, const char *b1_uri, const char *b2_uri) +{ + p4WarpedImfileRow *_object; + + _object = psAlloc(sizeof(p4WarpedImfileRow)); + psMemSetDeallocator(_object, (psFreeFunc)p4WarpedImfileRowFree); _object->p4_id = p4_id; @@ -14477,5 +14477,5 @@ } -static void p4PWarpedImfileRowFree(p4PWarpedImfileRow *object) +static void p4WarpedImfileRowFree(p4WarpedImfileRow *object) { psFree(object->exp_tag); @@ -14486,5 +14486,5 @@ } -bool p4PWarpedImfileCreateTable(psDB *dbh) +bool p4WarpedImfileCreateTable(psDB *dbh) { psMetadata *md = psMetadataAlloc(); @@ -14525,5 +14525,5 @@ } - bool status = psDBCreateTable(dbh, P4PWARPEDIMFILE_TABLE_NAME, md); + bool status = psDBCreateTable(dbh, P4WARPEDIMFILE_TABLE_NAME, md); psFree(md); @@ -14532,10 +14532,10 @@ } -bool p4PWarpedImfileDropTable(psDB *dbh) -{ - return psDBDropTable(dbh, P4PWARPEDIMFILE_TABLE_NAME); -} - -bool p4PWarpedImfileInsert(psDB * dbh, psS32 p4_id, const char *exp_tag, psS32 p3_version, const char *class_id, const char *uri, const char *b1_uri, const char *b2_uri) +bool p4WarpedImfileDropTable(psDB *dbh) +{ + return psDBDropTable(dbh, P4WARPEDIMFILE_TABLE_NAME); +} + +bool p4WarpedImfileInsert(psDB * dbh, psS32 p4_id, const char *exp_tag, psS32 p3_version, const char *class_id, const char *uri, const char *b1_uri, const char *b2_uri) { psMetadata *md = psMetadataAlloc(); @@ -14576,5 +14576,5 @@ } - bool status = psDBInsertOneRow(dbh, P4PWARPEDIMFILE_TABLE_NAME, md); + bool status = psDBInsertOneRow(dbh, P4WARPEDIMFILE_TABLE_NAME, md); psFree(md); @@ -14582,11 +14582,11 @@ } -long long p4PWarpedImfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) +long long p4WarpedImfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit) { long long deleted = 0; - long long count = psDBDeleteRows(dbh, P4PWARPEDIMFILE_TABLE_NAME, where, limit); + long long count = psDBDeleteRows(dbh, P4WARPEDIMFILE_TABLE_NAME, where, limit); if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4PWarpedImfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4WarpedImfile"); return count; @@ -14596,13 +14596,13 @@ return deleted; } -bool p4PWarpedImfileInsertObject(psDB *dbh, p4PWarpedImfileRow *object) -{ - return p4PWarpedImfileInsert(dbh, object->p4_id, object->exp_tag, object->p3_version, object->class_id, object->uri, object->b1_uri, object->b2_uri); -} - -bool p4PWarpedImfileInsertObjects(psDB *dbh, psArray *objects) +bool p4WarpedImfileInsertObject(psDB *dbh, p4WarpedImfileRow *object) +{ + return p4WarpedImfileInsert(dbh, object->p4_id, object->exp_tag, object->p3_version, object->class_id, object->uri, object->b1_uri, object->b2_uri); +} + +bool p4WarpedImfileInsertObjects(psDB *dbh, psArray *objects) { for (long i = 0; i < psArrayLength(objects); i++) { - if (!p4PWarpedImfileInsertObject(dbh, objects->data[i])) { + if (!p4WarpedImfileInsertObject(dbh, objects->data[i])) { return false; } @@ -14612,11 +14612,11 @@ } -bool p4PWarpedImfileInsertFits(psDB *dbh, const psFits *fits) +bool p4WarpedImfileInsertFits(psDB *dbh, const psFits *fits) { psArray *rowSet; - // move to (the first?) extension named P4PWARPEDIMFILE_TABLE_NAME - if (!psFitsMoveExtName(fits, P4PWARPEDIMFILE_TABLE_NAME)) { - psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P4PWARPEDIMFILE_TABLE_NAME); + // move to (the first?) extension named P4WARPEDIMFILE_TABLE_NAME + if (!psFitsMoveExtName(fits, P4WARPEDIMFILE_TABLE_NAME)) { + psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P4WARPEDIMFILE_TABLE_NAME); return false; } @@ -14636,5 +14636,5 @@ } - if (!psDBInsertRows(dbh, P4PWARPEDIMFILE_TABLE_NAME, rowSet)) { + if (!psDBInsertRows(dbh, P4WARPEDIMFILE_TABLE_NAME, rowSet)) { psError(PS_ERR_UNKNOWN, false, "databse insert failed"); psFree(rowSet); @@ -14647,9 +14647,9 @@ } -bool p4PWarpedImfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) +bool p4WarpedImfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit) { psArray *rowSet; - rowSet = psDBSelectRows(dbh, P4PWARPEDIMFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P4WARPEDIMFILE_TABLE_NAME, where, limit); if (!rowSet) { return false; @@ -14657,5 +14657,5 @@ // output to fits - if (!psFitsWriteTable(fits, NULL, rowSet, P4PWARPEDIMFILE_TABLE_NAME)) { + if (!psFitsWriteTable(fits, NULL, rowSet, P4WARPEDIMFILE_TABLE_NAME)) { psError(PS_ERR_UNKNOWN, false, "FITS table write failed"); psFree(rowSet); @@ -14668,5 +14668,5 @@ } -psMetadata *p4PWarpedImfileMetadataFromObject(const p4PWarpedImfileRow *object) +psMetadata *p4WarpedImfileMetadataFromObject(const p4WarpedImfileRow *object) { psMetadata *md = psMetadataAlloc(); @@ -14711,5 +14711,5 @@ } -p4PWarpedImfileRow *p4PWarpedImfileObjectFromMetadata(psMetadata *md) +p4WarpedImfileRow *p4WarpedImfileObjectFromMetadata(psMetadata *md) { @@ -14751,7 +14751,7 @@ } - return p4PWarpedImfileRowAlloc(p4_id, exp_tag, p3_version, class_id, uri, b1_uri, b2_uri); -} -psArray *p4PWarpedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) + return p4WarpedImfileRowAlloc(p4_id, exp_tag, p3_version, class_id, uri, b1_uri, b2_uri); +} +psArray *p4WarpedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit) { psArray *rowSet; @@ -14759,5 +14759,5 @@ psU64 i; - rowSet = psDBSelectRows(dbh, P4PWARPEDIMFILE_TABLE_NAME, where, limit); + rowSet = psDBSelectRows(dbh, P4WARPEDIMFILE_TABLE_NAME, where, limit); if (!rowSet) { return NULL; @@ -14769,5 +14769,5 @@ for (i = 0; i < rowSet->n; i++) { - p4PWarpedImfileRow *object = p4PWarpedImfileObjectFromMetadata(rowSet->data[i]); + p4WarpedImfileRow *object = p4WarpedImfileObjectFromMetadata(rowSet->data[i]); psArrayAdd(returnSet, 0, object); psFree(object); @@ -14778,11 +14778,11 @@ return returnSet; } -bool p4PWarpedImfileDeleteObject(psDB *dbh, const p4PWarpedImfileRow *object) -{ - psMetadata *where = p4PWarpedImfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P4PWARPEDIMFILE_TABLE_NAME, where, 0); +bool p4WarpedImfileDeleteObject(psDB *dbh, const p4WarpedImfileRow *object) +{ + psMetadata *where = p4WarpedImfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P4WARPEDIMFILE_TABLE_NAME, where, 0); psFree(where) if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4PWarpedImfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4WarpedImfile"); return false; } @@ -14790,21 +14790,21 @@ // XXX should this be a psAbort() instead? It is possible that // having an object match multiple rows was by design. - psError(PS_ERR_UNKNOWN, true, "p4PWarpedImfileRow object matched more then one row. Check your database schema"); - return false; - } - - return true; -} -long long p4PWarpedImfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) + psError(PS_ERR_UNKNOWN, true, "p4WarpedImfileRow object matched more then one row. Check your database schema"); + return false; + } + + return true; +} +long long p4WarpedImfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit) { long long deleted = 0; for (long long i = 0; i < objects->n; i++) { - p4PWarpedImfileRow *object = objects->data[i]; - psMetadata *where = p4PWarpedImfileMetadataFromObject(object); - long long count = psDBDeleteRows(dbh, P4PWARPEDIMFILE_TABLE_NAME, where, limit); + p4WarpedImfileRow *object = objects->data[i]; + psMetadata *where = p4WarpedImfileMetadataFromObject(object); + long long count = psDBDeleteRows(dbh, P4WARPEDIMFILE_TABLE_NAME, where, limit); psFree(where) if (count < 0) { - psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4PWarpedImfile"); + psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4WarpedImfile"); return count; } @@ -14815,5 +14815,5 @@ return deleted; } -bool p4PWarpedImfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) +bool p4WarpedImfilePrintObjects(FILE *stream, psArray *objects, bool mdcf) { PS_ASSERT_PTR_NON_NULL(objects, false); @@ -14821,9 +14821,9 @@ psMetadata *output = psMetadataAlloc(); for (long i = 0; i < psArrayLength(objects); i++) { - psMetadata *md = p4PWarpedImfileMetadataFromObject(objects->data[i]); + psMetadata *md = p4WarpedImfileMetadataFromObject(objects->data[i]); if (!psMetadataAddMetadata( output, PS_LIST_TAIL, - P4PWARPEDIMFILE_TABLE_NAME, + P4WARPEDIMFILE_TABLE_NAME, PS_META_DUPLICATE_OK, NULL, @@ -14846,9 +14846,9 @@ return true; } -bool p4PWarpedImfilePrintObject(FILE *stream, p4PWarpedImfileRow *object, bool mdcf) +bool p4WarpedImfilePrintObject(FILE *stream, p4WarpedImfileRow *object, bool mdcf) { PS_ASSERT_PTR_NON_NULL(object, false); - psMetadata *md = p4PWarpedImfileMetadataFromObject(object); + psMetadata *md = p4WarpedImfileMetadataFromObject(object); if (!ippdbPrintMetadataRaw(stream, md, mdcf)) { Index: /trunk/ippdb/src/ippdb.h =================================================================== --- /trunk/ippdb/src/ippdb.h (revision 10747) +++ /trunk/ippdb/src/ippdb.h (revision 10748) @@ -7439,7 +7439,7 @@ bool mdcf ///< format as mdconfig or simple ); -/** p4PWarpedImfileRow data structure - * - * Structure for representing a single row of p4PWarpedImfile table data. +/** p4WarpedImfileRow data structure + * + * Structure for representing a single row of p4WarpedImfile table data. */ @@ -7452,12 +7452,12 @@ char *b1_uri; char *b2_uri; -} p4PWarpedImfileRow; - -/** Creates a new p4PWarpedImfileRow object - * - * @return A new p4PWarpedImfileRow object or NULL on failure. - */ - -p4PWarpedImfileRow *p4PWarpedImfileRowAlloc( +} p4WarpedImfileRow; + +/** Creates a new p4WarpedImfileRow object + * + * @return A new p4WarpedImfileRow object or NULL on failure. + */ + +p4WarpedImfileRow *p4WarpedImfileRowAlloc( psS32 p4_id, const char *exp_tag, @@ -7469,19 +7469,19 @@ ); -/** Creates a new p4PWarpedImfile table - * - * @return true on success - */ - -bool p4PWarpedImfileCreateTable( +/** Creates a new p4WarpedImfile table + * + * @return true on success + */ + +bool p4WarpedImfileCreateTable( psDB *dbh ///< Database handle ); -/** Deletes a p4PWarpedImfile table - * - * @return true on success - */ - -bool p4PWarpedImfileDropTable( +/** Deletes a p4WarpedImfile table + * + * @return true on success + */ + +bool p4WarpedImfileDropTable( psDB *dbh ///< Database handle ); @@ -7494,5 +7494,5 @@ */ -bool p4PWarpedImfileInsert( +bool p4WarpedImfileInsert( psDB *dbh, ///< Database handle psS32 p4_id, @@ -7510,5 +7510,5 @@ */ -long long p4PWarpedImfileDelete( +long long p4WarpedImfileDelete( psDB *dbh, ///< Database handle const psMetadata *where, ///< Row match criteria @@ -7516,5 +7516,5 @@ ); -/** Insert a single p4PWarpedImfileRow object into a table +/** Insert a single p4WarpedImfileRow object into a table * * This function constructs and inserts a single row based on it's parameters. @@ -7523,10 +7523,10 @@ */ -bool p4PWarpedImfileInsertObject( - psDB *dbh, ///< Database handle - p4PWarpedImfileRow *object ///< p4PWarpedImfileRow object -); - -/** Insert an array of p4PWarpedImfileRow object into a table +bool p4WarpedImfileInsertObject( + psDB *dbh, ///< Database handle + p4WarpedImfileRow *object ///< p4WarpedImfileRow object +); + +/** Insert an array of p4WarpedImfileRow object into a table * * This function constructs and inserts multiple rows based on it's parameters. @@ -7535,10 +7535,10 @@ */ -bool p4PWarpedImfileInsertObjects( - psDB *dbh, ///< Database handle - psArray *objects ///< array of p4PWarpedImfileRow objects -); - -/** Insert data from a binary FITS table p4PWarpedImfileRow into the database +bool p4WarpedImfileInsertObjects( + psDB *dbh, ///< Database handle + psArray *objects ///< array of p4WarpedImfileRow objects +); + +/** Insert data from a binary FITS table p4WarpedImfileRow into the database * * This function expects a psFits object with a FITS table as the first @@ -7550,5 +7550,5 @@ */ -bool p4PWarpedImfileInsertFits( +bool p4WarpedImfileInsertFits( psDB *dbh, ///< Database handle const psFits *fits ///< psFits object @@ -7565,5 +7565,5 @@ */ -bool p4PWarpedImfileSelectRowsFits( +bool p4WarpedImfileSelectRowsFits( psDB *dbh, ///< Database handle psFits *fits, ///< psFits object @@ -7572,22 +7572,22 @@ ); -/** Convert a p4PWarpedImfileRow into an equivalent psMetadata +/** Convert a p4WarpedImfileRow into an equivalent psMetadata * * @return A psMetadata pointer or NULL on error */ -psMetadata *p4PWarpedImfileMetadataFromObject( - const p4PWarpedImfileRow *object ///< fooRow to convert into a psMetadata +psMetadata *p4WarpedImfileMetadataFromObject( + const p4WarpedImfileRow *object ///< fooRow to convert into a psMetadata ); /** Convert a psMetadata into an equivalent fooRow * - * @return A p4PWarpedImfileRow pointer or NULL on error - */ - -p4PWarpedImfileRow *p4PWarpedImfileObjectFromMetadata( + * @return A p4WarpedImfileRow pointer or NULL on error + */ + +p4WarpedImfileRow *p4WarpedImfileObjectFromMetadata( psMetadata *md ///< psMetadata to convert into a fooRow ); -/** Selects up to limit rows from the database and returns as p4PWarpedImfileRow objects in a psArray +/** Selects up to limit rows from the database and returns as p4WarpedImfileRow objects in a psArray * * See psDBSelectRows() for documentation on the format of where. @@ -7596,10 +7596,10 @@ */ -psArray *p4PWarpedImfileSelectRowObjects( +psArray *p4WarpedImfileSelectRowObjects( 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 p4PWarpedImfile +/** Deletes a row from the database coresponding to an p4WarpedImfile * * Note that a 'where' search psMetadata is constructed from each object and @@ -7609,7 +7609,7 @@ */ -bool p4PWarpedImfileDeleteObject( - psDB *dbh, ///< Database handle - const p4PWarpedImfileRow *object ///< Object to delete +bool p4WarpedImfileDeleteObject( + psDB *dbh, ///< Database handle + const p4WarpedImfileRow *object ///< Object to delete ); /** Deletes up to limit rows from the database and returns the number of rows actually deleted. @@ -7621,10 +7621,10 @@ */ -long long p4PWarpedImfileDeleteRowObjects( +long long p4WarpedImfileDeleteRowObjects( 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 p4PWarpedImfileRow objects +/** Formats and prints an array of p4WarpedImfileRow objects * * When mdcf is set the formated output is in psMetadataConfig @@ -7634,10 +7634,10 @@ */ -bool p4PWarpedImfilePrintObjects( +bool p4WarpedImfilePrintObjects( FILE *stream, ///< a stream - psArray *objects, ///< An array of p4PWarpedImfileRow objects + psArray *objects, ///< An array of p4WarpedImfileRow objects bool mdcf ///< format as mdconfig or simple ); -/** Formats and prints an p4PWarpedImfileRow object +/** Formats and prints an p4WarpedImfileRow object * * When mdcf is set the formated output is in psMetadataConfig @@ -7647,7 +7647,7 @@ */ -bool p4PWarpedImfilePrintObject( +bool p4WarpedImfilePrintObject( FILE *stream, ///< a stream - p4PWarpedImfileRow *object, ///< an p4PWarpedImfileRow object + p4WarpedImfileRow *object, ///< an p4WarpedImfileRow object bool mdcf ///< format as mdconfig or simple ); Index: /trunk/ippdb/tests/alloc.c =================================================================== --- /trunk/ippdb/tests/alloc.c (revision 10747) +++ /trunk/ippdb/tests/alloc.c (revision 10748) @@ -1490,7 +1490,7 @@ { - p4PWarpedImfileRow *object; - - object = p4PWarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string" ); + p4WarpedImfileRow *object; + + object = p4WarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string" ); if (!object) { Index: /trunk/ippdb/tests/createtable.c =================================================================== --- /trunk/ippdb/tests/createtable.c (revision 10747) +++ /trunk/ippdb/tests/createtable.c (revision 10748) @@ -523,5 +523,5 @@ } - if(!p4PWarpedImfileCreateTable(dbh)) { + if(!p4WarpedImfileCreateTable(dbh)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/dbcleanup.c =================================================================== --- /trunk/ippdb/tests/dbcleanup.c (revision 10747) +++ /trunk/ippdb/tests/dbcleanup.c (revision 10748) @@ -45,5 +45,5 @@ p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4Run"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4InputImfile"); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PWarpedImfile"); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4WarpedImfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PStackedImfile"); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PDiffImfile"); Index: /trunk/ippdb/tests/dbsetup.c =================================================================== --- /trunk/ippdb/tests/dbsetup.c (revision 10747) +++ /trunk/ippdb/tests/dbsetup.c (revision 10748) @@ -115,6 +115,6 @@ p4InputImfileCreateTable(dbh); - p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PWarpedImfile"); - p4PWarpedImfileCreateTable(dbh); + p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4WarpedImfile"); + p4WarpedImfileCreateTable(dbh); p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PStackedImfile"); Index: /trunk/ippdb/tests/droptable.c =================================================================== --- /trunk/ippdb/tests/droptable.c (revision 10747) +++ /trunk/ippdb/tests/droptable.c (revision 10748) @@ -523,5 +523,5 @@ } - if (!p4PWarpedImfileDropTable(dbh)) { + if (!p4WarpedImfileDropTable(dbh)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insert.c =================================================================== --- /trunk/ippdb/tests/insert.c (revision 10747) +++ /trunk/ippdb/tests/insert.c (revision 10748) @@ -523,5 +523,5 @@ } - if (!p4PWarpedImfileInsert(dbh, -32, "a string", -32, "a string", "a string", "a string", "a string")) { + if (!p4WarpedImfileInsert(dbh, -32, "a string", -32, "a string", "a string", "a string", "a string")) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertfits.c =================================================================== --- /trunk/ippdb/tests/insertfits.c (revision 10747) +++ /trunk/ippdb/tests/insertfits.c (revision 10748) @@ -908,5 +908,5 @@ } - if (!p4PWarpedImfileInsertFits(dbh, fits)) { + if (!p4WarpedImfileInsertFits(dbh, fits)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/insertobject.c =================================================================== --- /trunk/ippdb/tests/insertobject.c (revision 10747) +++ /trunk/ippdb/tests/insertobject.c (revision 10748) @@ -755,17 +755,17 @@ { psDB *dbh; - p4PWarpedImfileRow *object; - - dbh = psDBInit("localhost", "test", NULL, "test"); - if (!dbh) { - exit(EXIT_FAILURE); - } - - object = p4PWarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - if (!p4PWarpedImfileInsertObject(dbh, object)) { + p4WarpedImfileRow *object; + + dbh = psDBInit("localhost", "test", NULL, "test"); + if (!dbh) { + exit(EXIT_FAILURE); + } + + object = p4WarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + if (!p4WarpedImfileInsertObject(dbh, object)) { exit(EXIT_FAILURE); } Index: /trunk/ippdb/tests/metadatafromobject.c =================================================================== --- /trunk/ippdb/tests/metadatafromobject.c (revision 10747) +++ /trunk/ippdb/tests/metadatafromobject.c (revision 10748) @@ -1763,13 +1763,13 @@ { psMetadata *md; - p4PWarpedImfileRow *object; - bool status; - - object = p4PWarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"); - if (!object) { - exit(EXIT_FAILURE); - } - - md = p4PWarpedImfileMetadataFromObject(object); + p4WarpedImfileRow *object; + bool status; + + object = p4WarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"); + if (!object) { + exit(EXIT_FAILURE); + } + + md = p4WarpedImfileMetadataFromObject(object); if (!md) { exit(EXIT_FAILURE); Index: /trunk/ippdb/tests/objectfrommetadata.c =================================================================== --- /trunk/ippdb/tests/objectfrommetadata.c (revision 10747) +++ /trunk/ippdb/tests/objectfrommetadata.c (revision 10748) @@ -2700,5 +2700,5 @@ { psMetadata *md; - p4PWarpedImfileRow *object; + p4WarpedImfileRow *object; md = psMetadataAlloc(); @@ -2732,5 +2732,5 @@ } - object = p4PWarpedImfileObjectFromMetadata(md); + object = p4WarpedImfileObjectFromMetadata(md); if (!object) { psFree(md); Index: /trunk/ippdb/tests/selectrowsfits.c =================================================================== --- /trunk/ippdb/tests/selectrowsfits.c (revision 10747) +++ /trunk/ippdb/tests/selectrowsfits.c (revision 10748) @@ -769,5 +769,5 @@ } - if (!p4PWarpedImfileSelectRowsFits(dbh, fits, NULL, 1)) { + if (!p4WarpedImfileSelectRowsFits(dbh, fits, NULL, 1)) { exit(EXIT_FAILURE); }