Index: trunk/ippdb/tests/objectfrommetadata.c
===================================================================
--- trunk/ippdb/tests/objectfrommetadata.c	(revision 11988)
+++ trunk/ippdb/tests/objectfrommetadata.c	(revision 12026)
@@ -908,5 +908,5 @@
     {
         psMetadata      *md;
-        p1PendingExpRow *object;
+        guidePendingExpRow *object;
 
         md = psMetadataAlloc();
@@ -915,5 +915,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) {
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "guide_version", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -924,5 +924,5 @@
         }
 
-        object = p1PendingExpObjectFromMetadata(md);
+        object = guidePendingExpObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -936,5 +936,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!object->p1_version == -32) {
+        if (!object->guide_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -950,5 +950,5 @@
     {
         psMetadata      *md;
-        p2PendingExpRow *object;
+        chipPendingExpRow *object;
 
         md = psMetadataAlloc();
@@ -957,9 +957,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) {
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "chip_version", 0, NULL, -32)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "guide_version", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -982,5 +982,5 @@
         }
 
-        object = p2PendingExpObjectFromMetadata(md);
+        object = chipPendingExpObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -994,9 +994,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!object->p2_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p1_version == -32) {
+        if (!object->chip_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->guide_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1024,5 +1024,5 @@
     {
         psMetadata      *md;
-        p2PendingImfileRow *object;
+        chipPendingImfileRow *object;
 
         md = psMetadataAlloc();
@@ -1031,9 +1031,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) {
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "chip_version", 0, NULL, -32)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "guide_version", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1052,5 +1052,5 @@
         }
 
-        object = p2PendingImfileObjectFromMetadata(md);
+        object = chipPendingImfileObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -1064,9 +1064,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!object->p2_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p1_version == -32) {
+        if (!object->chip_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->guide_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1090,5 +1090,5 @@
     {
         psMetadata      *md;
-        p2ProcessedExpRow *object;
+        chipProcessedExpRow *object;
 
         md = psMetadataAlloc();
@@ -1097,9 +1097,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) {
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "chip_version", 0, NULL, -32)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "guide_version", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1118,5 +1118,5 @@
         }
 
-        object = p2ProcessedExpObjectFromMetadata(md);
+        object = chipProcessedExpObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -1130,9 +1130,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!object->p2_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p1_version == -32) {
+        if (!object->chip_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->guide_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1156,5 +1156,5 @@
     {
         psMetadata      *md;
-        p2MaskRow       *object;
+        chipMaskRow     *object;
 
         md = psMetadataAlloc();
@@ -1164,5 +1164,5 @@
         }
 
-        object = p2MaskObjectFromMetadata(md);
+        object = chipMaskObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -1182,5 +1182,5 @@
     {
         psMetadata      *md;
-        p2ProcessedImfileRow *object;
+        chipProcessedImfileRow *object;
 
         md = psMetadataAlloc();
@@ -1189,9 +1189,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p1_version", 0, NULL, -32)) {
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "chip_version", 0, NULL, -32)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "guide_version", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1233,5 +1233,5 @@
         }
 
-        object = p2ProcessedImfileObjectFromMetadata(md);
+        object = chipProcessedImfileObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -1245,9 +1245,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!object->p2_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p1_version == -32) {
+        if (!object->chip_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->guide_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1294,5 +1294,5 @@
     {
         psMetadata      *md;
-        p3PendingExpRow *object;
+        camPendingExpRow *object;
 
         md = psMetadataAlloc();
@@ -1301,9 +1301,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p3_version", 0, NULL, -32)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) {
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "cam_version", 0, NULL, -32)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "chip_version", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1322,5 +1322,5 @@
         }
 
-        object = p3PendingExpObjectFromMetadata(md);
+        object = camPendingExpObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -1334,9 +1334,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!object->p3_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p2_version == -32) {
+        if (!object->cam_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->chip_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1360,5 +1360,5 @@
     {
         psMetadata      *md;
-        p3ProcessedExpRow *object;
+        camProcessedExpRow *object;
 
         md = psMetadataAlloc();
@@ -1367,9 +1367,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p3_version", 0, NULL, -32)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p2_version", 0, NULL, -32)) {
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "cam_version", 0, NULL, -32)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "chip_version", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1439,5 +1439,5 @@
         }
 
-        object = p3ProcessedExpObjectFromMetadata(md);
+        object = camProcessedExpObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -1451,9 +1451,9 @@
             exit(EXIT_FAILURE);
         }
-        if (!object->p3_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p2_version == -32) {
+        if (!object->cam_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->chip_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1528,5 +1528,5 @@
     {
         psMetadata      *md;
-        p3MaskRow       *object;
+        camMaskRow      *object;
 
         md = psMetadataAlloc();
@@ -1536,5 +1536,5 @@
         }
 
-        object = p3MaskObjectFromMetadata(md);
+        object = camMaskObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -2636,8 +2636,8 @@
     {
         psMetadata      *md;
-        p4RunRow        *object;
-
-        md = psMetadataAlloc();
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) {
+        warpRunRow      *object;
+
+        md = psMetadataAlloc();
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "warp_id", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -2663,13 +2663,13 @@
         }
 
-        object = p4RunObjectFromMetadata(md);
-        if (!object) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-
-        if (!object->p4_id == -32) {
+        object = warpRunObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+
+        if (!object->warp_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -2700,8 +2700,8 @@
     {
         psMetadata      *md;
-        p4InputExpRow   *object;
-
-        md = psMetadataAlloc();
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) {
+        warpInputExpRow *object;
+
+        md = psMetadataAlloc();
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "warp_id", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -2711,5 +2711,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p3_version", 0, NULL, -32)) {
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "cam_version", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -2720,13 +2720,13 @@
         }
 
-        object = p4InputExpObjectFromMetadata(md);
-        if (!object) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-
-        if (!object->p4_id == -32) {
+        object = warpInputExpObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+
+        if (!object->warp_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -2736,5 +2736,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!object->p3_version == -32) {
+        if (!object->cam_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -2750,8 +2750,8 @@
     {
         psMetadata      *md;
-        p4SkyCellMapRow *object;
-
-        md = psMetadataAlloc();
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) {
+        warpSkyCellMapRow *object;
+
+        md = psMetadataAlloc();
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "warp_id", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -2769,5 +2769,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p3_version", 0, NULL, -32)) {
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "cam_version", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -2778,13 +2778,13 @@
         }
 
-        object = p4SkyCellMapObjectFromMetadata(md);
-        if (!object) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-
-        if (!object->p4_id == -32) {
+        object = warpSkyCellMapObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+
+        if (!object->warp_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -2802,5 +2802,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!object->p3_version == -32) {
+        if (!object->cam_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -2816,8 +2816,8 @@
     {
         psMetadata      *md;
-        p4SkyfileRow    *object;
-
-        md = psMetadataAlloc();
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) {
+        warpSkyfileRow  *object;
+
+        md = psMetadataAlloc();
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "warp_id", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -2844,13 +2844,13 @@
         }
 
-        object = p4SkyfileObjectFromMetadata(md);
-        if (!object) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-
-        if (!object->p4_id == -32) {
+        object = warpSkyfileObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+
+        if (!object->warp_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -2882,8 +2882,8 @@
     {
         psMetadata      *md;
-        p5RunRow        *object;
-
-        md = psMetadataAlloc();
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p5_id", 0, NULL, -32)) {
+        diffRunRow      *object;
+
+        md = psMetadataAlloc();
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "diff_id", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -2913,13 +2913,13 @@
         }
 
-        object = p5RunObjectFromMetadata(md);
-        if (!object) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-
-        if (!object->p5_id == -32) {
+        object = diffRunObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+
+        if (!object->diff_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -2954,12 +2954,12 @@
     {
         psMetadata      *md;
-        p5InputSkyfileRow *object;
-
-        md = psMetadataAlloc();
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p5_id", 0, NULL, -32)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) {
+        diffInputSkyfileRow *object;
+
+        md = psMetadataAlloc();
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "diff_id", 0, NULL, -32)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "warp_id", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -2982,17 +2982,17 @@
         }
 
-        object = p5InputSkyfileObjectFromMetadata(md);
-        if (!object) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-
-        if (!object->p5_id == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p4_id == -32) {
+        object = diffInputSkyfileObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+
+        if (!object->diff_id == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->warp_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -3020,8 +3020,8 @@
     {
         psMetadata      *md;
-        p5DiffSkyfileRow *object;
-
-        md = psMetadataAlloc();
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p5_id", 0, NULL, -32)) {
+        diffSkyfileRow  *object;
+
+        md = psMetadataAlloc();
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "diff_id", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -3040,13 +3040,13 @@
         }
 
-        object = p5DiffSkyfileObjectFromMetadata(md);
-        if (!object) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-
-        if (!object->p5_id == -32) {
+        object = diffSkyfileObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+
+        if (!object->diff_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -3070,8 +3070,8 @@
     {
         psMetadata      *md;
-        p6RunRow        *object;
-
-        md = psMetadataAlloc();
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p6_id", 0, NULL, -32)) {
+        stackRunRow     *object;
+
+        md = psMetadataAlloc();
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "stack_id", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -3101,13 +3101,13 @@
         }
 
-        object = p6RunObjectFromMetadata(md);
-        if (!object) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-
-        if (!object->p6_id == -32) {
+        object = stackRunObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+
+        if (!object->stack_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -3142,42 +3142,42 @@
     {
         psMetadata      *md;
-        p6InputSkyfileRow *object;
-
-        md = psMetadataAlloc();
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p6_id", 0, NULL, -32)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p4_id", 0, NULL, -32)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        object = p6InputSkyfileObjectFromMetadata(md);
-        if (!object) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-
-        if (!object->p6_id == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p4_id == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-    }
-
-    {
-        psMetadata      *md;
-        p6SumSkyfileRow *object;
-
-        md = psMetadataAlloc();
-        if (!psMetadataAddS32(md, PS_LIST_TAIL, "p6_id", 0, NULL, -32)) {
+        stackInputSkyfileRow *object;
+
+        md = psMetadataAlloc();
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "stack_id", 0, NULL, -32)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "warp_id", 0, NULL, -32)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        object = stackInputSkyfileObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+
+        if (!object->stack_id == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->warp_id == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+    }
+
+    {
+        psMetadata      *md;
+        stackSumSkyfileRow *object;
+
+        md = psMetadataAlloc();
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "stack_id", 0, NULL, -32)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -3196,13 +3196,13 @@
         }
 
-        object = p6SumSkyfileObjectFromMetadata(md);
-        if (!object) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(md);
-
-        if (!object->p6_id == -32) {
+        object = stackSumSkyfileObjectFromMetadata(md);
+        if (!object) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(md);
+
+        if (!object->stack_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);