Index: /trunk/ippdb/configure.ac
===================================================================
--- /trunk/ippdb/configure.ac	(revision 14251)
+++ /trunk/ippdb/configure.ac	(revision 14252)
@@ -7,5 +7,5 @@
 AC_PREREQ(2.61)
 
-AC_INIT([ippdb], [1.1.25], [pan-starrs.ifa.hawaii.edu])
+AC_INIT([ippdb], [1.1.26], [pan-starrs.ifa.hawaii.edu])
 AC_CONFIG_SRCDIR([ippdb.pc.in])
 
Index: /trunk/ippdb/src/ippdb.c
===================================================================
--- /trunk/ippdb/src/ippdb.c	(revision 14251)
+++ /trunk/ippdb/src/ippdb.c	(revision 14252)
@@ -10135,5 +10135,5 @@
 static void diffInputSkyfileRowFree(diffInputSkyfileRow *object);
 
-diffInputSkyfileRow *diffInputSkyfileRowAlloc(psS64 diff_id, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *kind, bool template)
+diffInputSkyfileRow *diffInputSkyfileRowAlloc(psS64 diff_id, bool template, psS64 stack_id, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *kind)
 {
     diffInputSkyfileRow *_object;
@@ -10143,9 +10143,10 @@
 
     _object->diff_id = diff_id;
+    _object->template = template;
+    _object->stack_id = stack_id;
     _object->warp_id = warp_id;
     _object->skycell_id = psStringCopy(skycell_id);
     _object->tess_id = psStringCopy(tess_id);
     _object->kind = psStringCopy(kind);
-    _object->template = template;
 
     return _object;
@@ -10167,15 +10168,25 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "warp_id", PS_DATA_S64, "Primary Key fkey(warp_id, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)", 0)) {
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, "Primary Key", 0)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item template");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "stack_id", PS_DATA_S64, "fkey(stack_id) ref stackSumSkyfile(stack_id)", 0)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item stack_id");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "warp_id", PS_DATA_S64, "fkey(warp_id, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)", 0)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
         psFree(md);
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Primary Key", "64")) {
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Key", "64")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
         psFree(md);
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Primary Key", "64")) {
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Key", "64")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
         psFree(md);
@@ -10187,9 +10198,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, 0)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item template");
-        psFree(md);
-        return false;
-    }
 
     bool status = psDBCreateTable(dbh, DIFFINPUTSKYFILE_TABLE_NAME, md);
@@ -10205,5 +10211,5 @@
 }
 
-bool diffInputSkyfileInsert(psDB * dbh, psS64 diff_id, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *kind, bool template)
+bool diffInputSkyfileInsert(psDB * dbh, psS64 diff_id, bool template, psS64 stack_id, psS64 warp_id, const char *skycell_id, const char *tess_id, const char *kind)
 {
     psMetadata *md = psMetadataAlloc();
@@ -10213,4 +10219,14 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, template)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item template");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "stack_id", PS_DATA_S64, NULL, stack_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item stack_id");
+        psFree(md);
+        return false;
+    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "warp_id", PS_DATA_S64, NULL, warp_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
@@ -10230,9 +10246,4 @@
     if (!psMetadataAdd(md, PS_LIST_TAIL, "kind", PS_DATA_STRING, NULL, kind)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item kind");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, template)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item template");
         psFree(md);
         return false;
@@ -10261,5 +10272,5 @@
 bool diffInputSkyfileInsertObject(psDB *dbh, diffInputSkyfileRow *object)
 {
-    return diffInputSkyfileInsert(dbh, object->diff_id, object->warp_id, object->skycell_id, object->tess_id, object->kind, object->template);
+    return diffInputSkyfileInsert(dbh, object->diff_id, object->template, object->stack_id, object->warp_id, object->skycell_id, object->tess_id, object->kind);
 }
 
@@ -10339,4 +10350,14 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, object->template)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item template");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "stack_id", PS_DATA_S64, NULL, object->stack_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item stack_id");
+        psFree(md);
+        return false;
+    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "warp_id", PS_DATA_S64, NULL, object->warp_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
@@ -10359,9 +10380,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, object->template)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item template");
-        psFree(md);
-        return false;
-    }
 
 
@@ -10378,4 +10394,14 @@
         return false;
     }
+    bool template = psMetadataLookupBool(&status, md, "template");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item template");
+        return false;
+    }
+    psS64 stack_id = psMetadataLookupS64(&status, md, "stack_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stack_id");
+        return false;
+    }
     psS64 warp_id = psMetadataLookupS64(&status, md, "warp_id");
     if (!status) {
@@ -10398,11 +10424,6 @@
         return false;
     }
-    bool template = psMetadataLookupBool(&status, md, "template");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item template");
-        return false;
-    }
-
-    return diffInputSkyfileRowAlloc(diff_id, warp_id, skycell_id, tess_id, kind, template);
+
+    return diffInputSkyfileRowAlloc(diff_id, template, stack_id, warp_id, skycell_id, tess_id, kind);
 }
 psArray *diffInputSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Index: /trunk/ippdb/src/ippdb.h
===================================================================
--- /trunk/ippdb/src/ippdb.h	(revision 14251)
+++ /trunk/ippdb/src/ippdb.h	(revision 14252)
@@ -4962,9 +4962,10 @@
 typedef struct {
     psS64           diff_id;
+    bool            template;
+    psS64           stack_id;
     psS64           warp_id;
     char            *skycell_id;
     char            *tess_id;
     char            *kind;
-    bool            template;
 } diffInputSkyfileRow;
 
@@ -4976,9 +4977,10 @@
 diffInputSkyfileRow *diffInputSkyfileRowAlloc(
     psS64           diff_id,
+    bool            template,
+    psS64           stack_id,
     psS64           warp_id,
     const char      *skycell_id,
     const char      *tess_id,
-    const char      *kind,
-    bool            template
+    const char      *kind
 );
 
@@ -5011,9 +5013,10 @@
     psDB            *dbh,               ///< Database handle
     psS64           diff_id,
+    bool            template,
+    psS64           stack_id,
     psS64           warp_id,
     const char      *skycell_id,
     const char      *tess_id,
-    const char      *kind,
-    bool            template
+    const char      *kind
 );
 
Index: /trunk/ippdb/tests/alloc.c
===================================================================
--- /trunk/ippdb/tests/alloc.c	(revision 14251)
+++ /trunk/ippdb/tests/alloc.c	(revision 14252)
@@ -1100,5 +1100,5 @@
         diffInputSkyfileRow *object;
 
-        object = diffInputSkyfileRowAlloc(-64, -64, "a string", "a string", "a string", true    );
+        object = diffInputSkyfileRowAlloc(-64, true, -64, -64, "a string", "a string", "a string"    );
 
         if (!object) {
@@ -1110,4 +1110,12 @@
             exit(EXIT_FAILURE);
         }
+        if (!object->template == true) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->stack_id == -64) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
         if (!object->warp_id == -64) {
             psFree(object);
@@ -1123,8 +1131,4 @@
         }
         if (strncmp(object->kind, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->template == true) {
             psFree(object);
             exit(EXIT_FAILURE);
Index: /trunk/ippdb/tests/insert.c
===================================================================
--- /trunk/ippdb/tests/insert.c	(revision 14251)
+++ /trunk/ippdb/tests/insert.c	(revision 14252)
@@ -343,5 +343,5 @@
         }
 
-        if (!diffInputSkyfileInsert(dbh, -64, -64, "a string", "a string", "a string", true)) {
+        if (!diffInputSkyfileInsert(dbh, -64, true, -64, -64, "a string", "a string", "a string")) {
             exit(EXIT_FAILURE);
         }
Index: /trunk/ippdb/tests/insertobject.c
===================================================================
--- /trunk/ippdb/tests/insertobject.c	(revision 14251)
+++ /trunk/ippdb/tests/insertobject.c	(revision 14252)
@@ -498,5 +498,5 @@
         }
 
-        object = diffInputSkyfileRowAlloc(-64, -64, "a string", "a string", "a string", true);
+        object = diffInputSkyfileRowAlloc(-64, true, -64, -64, "a string", "a string", "a string");
         if (!object) {
             exit(EXIT_FAILURE);
Index: /trunk/ippdb/tests/metadatafromobject.c
===================================================================
--- /trunk/ippdb/tests/metadatafromobject.c	(revision 14251)
+++ /trunk/ippdb/tests/metadatafromobject.c	(revision 14252)
@@ -1249,5 +1249,5 @@
         bool            status;
 
-        object = diffInputSkyfileRowAlloc(-64, -64, "a string", "a string", "a string", true);
+        object = diffInputSkyfileRowAlloc(-64, true, -64, -64, "a string", "a string", "a string");
         if (!object) {
             exit(EXIT_FAILURE);
@@ -1264,4 +1264,11 @@
             exit(EXIT_FAILURE);
         }
+        if (!psMetadataLookupBool(&status, md, "template") == true) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1276,8 +1283,4 @@
         }
         if (strncmp(psMetadataLookupPtr(&status, md, "kind"), "a string", MAX_STRING_LENGTH)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (!psMetadataLookupBool(&status, md, "template") == true) {
             psFree(md);
             exit(EXIT_FAILURE);
Index: /trunk/ippdb/tests/objectfrommetadata.c
===================================================================
--- /trunk/ippdb/tests/objectfrommetadata.c	(revision 14251)
+++ /trunk/ippdb/tests/objectfrommetadata.c	(revision 14252)
@@ -1960,4 +1960,11 @@
             exit(EXIT_FAILURE);
         }
+        if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, true)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1975,8 +1982,4 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, true)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
 
         object = diffInputSkyfileObjectFromMetadata(md);
@@ -1991,4 +1994,11 @@
             exit(EXIT_FAILURE);
         }
+        if (!object->template == true) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
             psFree(object);
             exit(EXIT_FAILURE);
@@ -2003,8 +2013,4 @@
         }
         if (strncmp(object->kind, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->template == true) {
             psFree(object);
             exit(EXIT_FAILURE);