Index: trunk/ippdb/tests/metadatafromobject.c
===================================================================
--- trunk/ippdb/tests/metadatafromobject.c	(revision 11988)
+++ trunk/ippdb/tests/metadatafromobject.c	(revision 12026)
@@ -591,13 +591,13 @@
     {
         psMetadata      *md;
-        p1PendingExpRow *object;
-        bool            status;
-
-        object = p1PendingExpRowAlloc("a string", -32, "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p1PendingExpMetadataFromObject(object);
+        guidePendingExpRow *object;
+        bool            status;
+
+        object = guidePendingExpRowAlloc("a string", -32, "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = guidePendingExpMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -610,5 +610,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataLookupS32(&status, md, "p1_version") == -32) {
+        if (!psMetadataLookupS32(&status, md, "guide_version") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -624,13 +624,13 @@
     {
         psMetadata      *md;
-        p2PendingExpRow *object;
-        bool            status;
-
-        object = p2PendingExpRowAlloc("a string", -32, -32, "a string", "a string", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p2PendingExpMetadataFromObject(object);
+        chipPendingExpRow *object;
+        bool            status;
+
+        object = chipPendingExpRowAlloc("a string", -32, -32, "a string", "a string", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = chipPendingExpMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -643,9 +643,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataLookupS32(&status, md, "p2_version") == -32) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataLookupS32(&status, md, "p1_version") == -32) {
+        if (!psMetadataLookupS32(&status, md, "chip_version") == -32) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataLookupS32(&status, md, "guide_version") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -673,13 +673,13 @@
     {
         psMetadata      *md;
-        p2PendingImfileRow *object;
-        bool            status;
-
-        object = p2PendingImfileRowAlloc("a string", -32, -32, "a string", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p2PendingImfileMetadataFromObject(object);
+        chipPendingImfileRow *object;
+        bool            status;
+
+        object = chipPendingImfileRowAlloc("a string", -32, -32, "a string", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = chipPendingImfileMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -692,9 +692,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataLookupS32(&status, md, "p2_version") == -32) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataLookupS32(&status, md, "p1_version") == -32) {
+        if (!psMetadataLookupS32(&status, md, "chip_version") == -32) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataLookupS32(&status, md, "guide_version") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -718,13 +718,13 @@
     {
         psMetadata      *md;
-        p2ProcessedExpRow *object;
-        bool            status;
-
-        object = p2ProcessedExpRowAlloc("a string", -32, -32, "a string", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p2ProcessedExpMetadataFromObject(object);
+        chipProcessedExpRow *object;
+        bool            status;
+
+        object = chipProcessedExpRowAlloc("a string", -32, -32, "a string", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = chipProcessedExpMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -737,9 +737,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataLookupS32(&status, md, "p2_version") == -32) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataLookupS32(&status, md, "p1_version") == -32) {
+        if (!psMetadataLookupS32(&status, md, "chip_version") == -32) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataLookupS32(&status, md, "guide_version") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -763,13 +763,13 @@
     {
         psMetadata      *md;
-        p2MaskRow       *object;
-        bool            status;
-
-        object = p2MaskRowAlloc("a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p2MaskMetadataFromObject(object);
+        chipMaskRow     *object;
+        bool            status;
+
+        object = chipMaskRowAlloc("a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = chipMaskMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -788,13 +788,13 @@
     {
         psMetadata      *md;
-        p2ProcessedImfileRow *object;
-        bool            status;
-
-        object = p2ProcessedImfileRowAlloc("a string", -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string", -16);
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p2ProcessedImfileMetadataFromObject(object);
+        chipProcessedImfileRow *object;
+        bool            status;
+
+        object = chipProcessedImfileRowAlloc("a string", -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string", -16);
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = chipProcessedImfileMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -807,9 +807,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataLookupS32(&status, md, "p2_version") == -32) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataLookupS32(&status, md, "p1_version") == -32) {
+        if (!psMetadataLookupS32(&status, md, "chip_version") == -32) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataLookupS32(&status, md, "guide_version") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -856,13 +856,13 @@
     {
         psMetadata      *md;
-        p3PendingExpRow *object;
-        bool            status;
-
-        object = p3PendingExpRowAlloc("a string", -32, -32, "a string", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p3PendingExpMetadataFromObject(object);
+        camPendingExpRow *object;
+        bool            status;
+
+        object = camPendingExpRowAlloc("a string", -32, -32, "a string", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = camPendingExpMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -875,9 +875,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataLookupS32(&status, md, "p3_version") == -32) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataLookupS32(&status, md, "p2_version") == -32) {
+        if (!psMetadataLookupS32(&status, md, "cam_version") == -32) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataLookupS32(&status, md, "chip_version") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -901,13 +901,13 @@
     {
         psMetadata      *md;
-        p3ProcessedExpRow *object;
-        bool            status;
-
-        object = p3ProcessedExpRowAlloc("a string", -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -16, "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p3ProcessedExpMetadataFromObject(object);
+        camProcessedExpRow *object;
+        bool            status;
+
+        object = camProcessedExpRowAlloc("a string", -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -16, "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = camProcessedExpMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -920,9 +920,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataLookupS32(&status, md, "p3_version") == -32) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataLookupS32(&status, md, "p2_version") == -32) {
+        if (!psMetadataLookupS32(&status, md, "cam_version") == -32) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataLookupS32(&status, md, "chip_version") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -997,13 +997,13 @@
     {
         psMetadata      *md;
-        p3MaskRow       *object;
-        bool            status;
-
-        object = p3MaskRowAlloc("a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p3MaskMetadataFromObject(object);
+        camMaskRow      *object;
+        bool            status;
+
+        object = camMaskRowAlloc("a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = camMaskMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -1695,20 +1695,20 @@
     {
         psMetadata      *md;
-        p4RunRow        *object;
-        bool            status;
-
-        object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p4RunMetadataFromObject(object);
-        if (!md) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-
-        if (!psMetadataLookupS32(&status, md, "p4_id") == -32) {
+        warpRunRow      *object;
+        bool            status;
+
+        object = warpRunRowAlloc(-32, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = warpRunMetadataFromObject(object);
+        if (!md) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+
+        if (!psMetadataLookupS32(&status, md, "warp_id") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1739,20 +1739,20 @@
     {
         psMetadata      *md;
-        p4InputExpRow   *object;
-        bool            status;
-
-        object = p4InputExpRowAlloc(-32, "a string", -32, true);
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p4InputExpMetadataFromObject(object);
-        if (!md) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-
-        if (!psMetadataLookupS32(&status, md, "p4_id") == -32) {
+        warpInputExpRow *object;
+        bool            status;
+
+        object = warpInputExpRowAlloc(-32, "a string", -32, true);
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = warpInputExpMetadataFromObject(object);
+        if (!md) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+
+        if (!psMetadataLookupS32(&status, md, "warp_id") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1762,5 +1762,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataLookupS32(&status, md, "p3_version") == -32) {
+        if (!psMetadataLookupS32(&status, md, "cam_version") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1776,20 +1776,20 @@
     {
         psMetadata      *md;
-        p4SkyCellMapRow *object;
-        bool            status;
-
-        object = p4SkyCellMapRowAlloc(-32, "a string", "a string", "a string", -32, "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p4SkyCellMapMetadataFromObject(object);
-        if (!md) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-
-        if (!psMetadataLookupS32(&status, md, "p4_id") == -32) {
+        warpSkyCellMapRow *object;
+        bool            status;
+
+        object = warpSkyCellMapRowAlloc(-32, "a string", "a string", "a string", -32, "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = warpSkyCellMapMetadataFromObject(object);
+        if (!md) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+
+        if (!psMetadataLookupS32(&status, md, "warp_id") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1807,5 +1807,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataLookupS32(&status, md, "p3_version") == -32) {
+        if (!psMetadataLookupS32(&status, md, "cam_version") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1821,20 +1821,20 @@
     {
         psMetadata      *md;
-        p4SkyfileRow    *object;
-        bool            status;
-
-        object = p4SkyfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64);
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p4SkyfileMetadataFromObject(object);
-        if (!md) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-
-        if (!psMetadataLookupS32(&status, md, "p4_id") == -32) {
+        warpSkyfileRow  *object;
+        bool            status;
+
+        object = warpSkyfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64);
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = warpSkyfileMetadataFromObject(object);
+        if (!md) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+
+        if (!psMetadataLookupS32(&status, md, "warp_id") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1866,20 +1866,20 @@
     {
         psMetadata      *md;
-        p5RunRow        *object;
-        bool            status;
-
-        object = p5RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p5RunMetadataFromObject(object);
-        if (!md) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-
-        if (!psMetadataLookupS32(&status, md, "p5_id") == -32) {
+        diffRunRow      *object;
+        bool            status;
+
+        object = diffRunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = diffRunMetadataFromObject(object);
+        if (!md) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+
+        if (!psMetadataLookupS32(&status, md, "diff_id") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1914,24 +1914,24 @@
     {
         psMetadata      *md;
-        p5InputSkyfileRow *object;
-        bool            status;
-
-        object = p5InputSkyfileRowAlloc(-32, -32, "a string", "a string", "a string", true);
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p5InputSkyfileMetadataFromObject(object);
-        if (!md) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-
-        if (!psMetadataLookupS32(&status, md, "p5_id") == -32) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataLookupS32(&status, md, "p4_id") == -32) {
+        diffInputSkyfileRow *object;
+        bool            status;
+
+        object = diffInputSkyfileRowAlloc(-32, -32, "a string", "a string", "a string", true);
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = diffInputSkyfileMetadataFromObject(object);
+        if (!md) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+
+        if (!psMetadataLookupS32(&status, md, "diff_id") == -32) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataLookupS32(&status, md, "warp_id") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1959,20 +1959,20 @@
     {
         psMetadata      *md;
-        p5DiffSkyfileRow *object;
-        bool            status;
-
-        object = p5DiffSkyfileRowAlloc(-32, "a string", 64.64, 64.64);
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p5DiffSkyfileMetadataFromObject(object);
-        if (!md) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-
-        if (!psMetadataLookupS32(&status, md, "p5_id") == -32) {
+        diffSkyfileRow  *object;
+        bool            status;
+
+        object = diffSkyfileRowAlloc(-32, "a string", 64.64, 64.64);
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = diffSkyfileMetadataFromObject(object);
+        if (!md) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+
+        if (!psMetadataLookupS32(&status, md, "diff_id") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1996,20 +1996,20 @@
     {
         psMetadata      *md;
-        p6RunRow        *object;
-        bool            status;
-
-        object = p6RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p6RunMetadataFromObject(object);
-        if (!md) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-
-        if (!psMetadataLookupS32(&status, md, "p6_id") == -32) {
+        stackRunRow     *object;
+        bool            status;
+
+        object = stackRunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = stackRunMetadataFromObject(object);
+        if (!md) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+
+        if (!psMetadataLookupS32(&status, md, "stack_id") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -2044,49 +2044,49 @@
     {
         psMetadata      *md;
-        p6InputSkyfileRow *object;
-        bool            status;
-
-        object = p6InputSkyfileRowAlloc(-32, -32);
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p6InputSkyfileMetadataFromObject(object);
-        if (!md) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-
-        if (!psMetadataLookupS32(&status, md, "p6_id") == -32) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataLookupS32(&status, md, "p4_id") == -32) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-    }
-
-    {
-        psMetadata      *md;
-        p6SumSkyfileRow *object;
-        bool            status;
-
-        object = p6SumSkyfileRowAlloc(-32, "a string", 64.64, 64.64);
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p6SumSkyfileMetadataFromObject(object);
-        if (!md) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-
-        if (!psMetadataLookupS32(&status, md, "p6_id") == -32) {
+        stackInputSkyfileRow *object;
+        bool            status;
+
+        object = stackInputSkyfileRowAlloc(-32, -32);
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = stackInputSkyfileMetadataFromObject(object);
+        if (!md) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+
+        if (!psMetadataLookupS32(&status, md, "stack_id") == -32) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataLookupS32(&status, md, "warp_id") == -32) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+    }
+
+    {
+        psMetadata      *md;
+        stackSumSkyfileRow *object;
+        bool            status;
+
+        object = stackSumSkyfileRowAlloc(-32, "a string", 64.64, 64.64);
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = stackSumSkyfileMetadataFromObject(object);
+        if (!md) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+
+        if (!psMetadataLookupS32(&status, md, "stack_id") == -32) {
             psFree(md);
             exit(EXIT_FAILURE);