Index: trunk/ippTools/src/pxtools.h
===================================================================
--- trunk/ippTools/src/pxtools.h	(revision 6225)
+++ trunk/ippTools/src/pxtools.h	(revision 6258)
@@ -14,4 +14,28 @@
 # define RECIPE "PHASE2"
 # define MAX_ROWS 10e9
+
+typedef enum {
+    P0_MODE_NONE,		      	        
+    P0_MODE_PENDING,			        // grab from new
+    P0_MODE_UPDATE,	                    // grab from new, create raw
+} p0mode;
+
+typedef struct {
+    p0mode mode;
+    psTime *start;
+    psTime *stop;
+    psMetadata *camera;
+    psDB *database;
+    psMetadata *site;
+    psMetadata *recipe;
+    psMetadata *arguments;
+    char *camera_name;
+    char *filter;
+    char *exp_id;
+    char *class;
+    char *class_id;
+    char *url;
+    psMetadata *where;
+} p0Config;
 
 typedef enum {
@@ -46,4 +70,14 @@
     psMetadata *where;
 } pxConfig;
+
+typedef struct {
+    newExpRow *exposure;
+    psArray *images;
+} newFrame;
+
+newFrame *newFrameAlloc(
+    newExpRow *exposure,
+    psArray *images
+);
 
 typedef struct {
@@ -83,7 +117,5 @@
 
 psArray *p2rawToPending (pxConfig *config, psArray *rawFrames);
-psArray *p2searchRawFrames (pxConfig *config);
 bool p2insertPendingFrames (pxConfig *config, psArray *rawFrames);
-psArray *p2searchPendingFrames (pxConfig *config);
 bool p2writePendingImages (pxConfig *config, psArray *frames);
 bool p2updatePendingFrames (pxConfig *config, psArray *pendingFrames);
@@ -95,4 +127,8 @@
 psArray *p2searchPendingExp(pxConfig *config);
 p2DoneExpRow *p2pendingToDoneExp(p2PendingExpRow *pendingExp);
+
 bool rawScienceFramePrint(FILE *stream, pxConfig *config, psArray *frames);
+psArray *rawScienceFrameSearch(pxConfig *config);
+
 bool p2PendingFramePrint(FILE *stream, pxConfig *config, psArray *frames);
+psArray *p2PendingFrameSearch(pxConfig *config);