Index: trunk/ippTools/src/pxframes.c
===================================================================
--- trunk/ippTools/src/pxframes.c	(revision 8661)
+++ trunk/ippTools/src/pxframes.c	(revision 9057)
@@ -80,5 +80,5 @@
 
 // XXX fix the exposure search so that it doesn't dump the entire table
-#define PX_FRAME_SEARCH(frametype, exptype, imfiletype) \
+#define PX_FRAME_SEARCH(frametype, exptype, imfiletype, key) \
 psArray *frametype##Search(pxConfig *config) \
 { \
@@ -98,6 +98,6 @@
 \
         psMetadata *where = psMetadataAlloc(); \
-        psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", PS_META_REPLACE, "==", \
-            exposure->exp_id); \
+        psMetadataAddStr(where, PS_LIST_TAIL, #key, PS_META_REPLACE, "==", \
+            exposure->key); \
  \
         psArray *images = imfiletype##SelectRowObjects(config->dbh, where, \
@@ -105,5 +105,5 @@
         psFree(where); \
         if (!images) { \
-            psError(PS_ERR_UNKNOWN, false, "no " #imfiletype " rows found for exp_id %s", exposure->exp_id); \
+            psError(PS_ERR_UNKNOWN, false, "no " #imfiletype " rows found for key %s", exposure->key); \
  \
             continue; \
@@ -126,9 +126,9 @@
 } 
 
-PX_FRAME_SEARCH(pzPendingFrame, pzPendingExp, pzPendingImfile);
-PX_FRAME_SEARCH(newFrame, newExp, newImfile);
-PX_FRAME_SEARCH(rawDetrendFrame, rawDetrendExp, rawImfile);
-PX_FRAME_SEARCH(rawScienceFrame, rawScienceExp, rawImfile);
-PX_FRAME_SEARCH(p2PendingFrame, p2PendingExp, p2PendingImfile);
+PX_FRAME_SEARCH(pzPendingFrame, pzPendingExp, pzPendingImfile, exp_id);
+//PX_FRAME_SEARCH(newFrame, newExp, newImfile);
+PX_FRAME_SEARCH(rawDetrendFrame, rawDetrendExp, rawImfile, exp_tag);
+PX_FRAME_SEARCH(rawScienceFrame, rawScienceExp, rawImfile, exp_tag);
+PX_FRAME_SEARCH(p2PendingFrame, p2PendingExp, p2PendingImfile, exp_tag);
 
 
@@ -172,5 +172,5 @@
         newImfileRow *newImfile = newImages->data[i];
         rawImfileRow *rawImfile = rawImfileRowAlloc(
-            newImfile->exp_id,
+            newImfile->exp_tag,
             newImfile->class,
             newImfile->class_id,