Index: trunk/glueforge/templates/psdb/pop.tt
===================================================================
--- trunk/glueforge/templates/psdb/pop.tt	(revision 4341)
+++ trunk/glueforge/templates/psdb/pop.tt	(revision 5907)
@@ -1,7 +1,7 @@
 [% USE format -%]
 [% indented = format('%-15s %s') -%]
-bool [% namespace %]Pop(psDB *dbh, 
+bool [% table.namespace %]Pop(psDB *dbh, 
 [%- SET i = 0 -%]
-[% FOREACH item = columns -%]
+[% FOREACH item = table.columns -%]
 [% IF i == 0 %][% i = 1 %][% ELSE %], [% END -%]
 [% IF item.type == "STR" -%]
@@ -19,5 +19,5 @@
     int             rowID;
 
-    rowSet = psDBSelectRows(dbh, [% namespace FILTER upper %]_TABLE_NAME, NULL, 1);
+    rowSet = psDBSelectRows(dbh, [% table.namespace FILTER upper %]_TABLE_NAME, NULL, 1);
     row = psArrayGet(rowSet, 0);
     // FIXME: psArrayGet should increment the ref count
@@ -29,7 +29,7 @@
     psFree(rowSet);
 
-    rowID = psMetadataLookupS32(&status, row, [% namespace FILTER upper %]_INDEX_NAME);
+    rowID = psMetadataLookupS32(&status, row, [% table.namespace FILTER upper %]_INDEX_NAME);
     if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item %s", [% namespace FILTER upper %]_INDEX_NAME);
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item %s", [% table.namespace FILTER upper %]_INDEX_NAME);
         psFree(row);
         return NULL;
@@ -37,7 +37,7 @@
 
     popped = psMetadataAlloc();
-    psMetadataAddS32(popped, PS_LIST_TAIL, [% namespace FILTER upper %]_INDEX_NAME, NULL, rowID);
+    psMetadataAddS32(popped, PS_LIST_TAIL, [% table.namespace FILTER upper %]_INDEX_NAME, 0, NULL, rowID);
 
-    deleted = psDBDeleteRows(dbh, [% namespace FILTER upper %]_TABLE_NAME, popped);
+    deleted = psDBDeleteRows(dbh, [% table.namespace FILTER upper %]_TABLE_NAME, popped, 0);
     if (deleted != 1) {
         psError(PS_ERR_UNKNOWN, false, "database failed to delete row");
@@ -49,5 +49,5 @@
     psFree(popped);
 
-[% FOREACH item = columns -%]
+[% FOREACH item = table.columns -%]
 [% IF item.type == "S32" or item.type == "F32" or item.type == "F64" -%]
     *[% item.name %] = psMetadataLookup[% item.type %](&status, row, "[% item.name %]");