Index: trunk/ippdb/src/ippdb.c
===================================================================
--- trunk/ippdb/src/ippdb.c	(revision 10686)
+++ 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)) {