Index: trunk/ippTools/src/p2searchPendingFrames.c
===================================================================
--- trunk/ippTools/src/p2searchPendingFrames.c	(revision 6032)
+++ trunk/ippTools/src/p2searchPendingFrames.c	(revision 6060)
@@ -1,6 +1,14 @@
 # include "p2search.h"
 
+bool psTimeIsZero(psTime *time) {
+    if (time->sec == 0 || time->nsec == 0) {
+        return false;
+    }
+
+    return true;
+}
+
 // select pending frames (exposure+images) which are done/not done
-psArray *p2searchPendingFrames (p2SearchConfig *config) {
+psArray *p2searchPendingFrames (p2Config *config) {
 
     // build 'where' structure
@@ -9,15 +17,15 @@
     // in order to include these restrictions, we need to define these table columns
     if (config->camera != NULL) {
-	psMetadataAddStr (where, PS_LIST_TAIL, "CAMERA", 0, "==", config->camera);
+        psMetadataAddStr (where, PS_LIST_TAIL, "CAMERA", 0, "==", config->camera_name);
     }
     if (config->filter != NULL) {
-	psMetadataAddStr (where, PS_LIST_TAIL, "FILTER", 0, "==", config->filter);
+    psMetadataAddStr (where, PS_LIST_TAIL, "FILTER", 0, "==", config->filter);
     }
     if (!psTimeIsZero(config->start) && !psTimeIsZero(config->stop)) {
-	psMetadataAddTime (where, PS_LIST_TAIL, "TIME_START", 0, "<", config->time_stop);
-	psMetadataAddTime (where, PS_LIST_TAIL, "TIME_STOP", 0, ">", config->time_start);
+    psMetadataAddTime (where, PS_LIST_TAIL, "TIME_START", 0, "<", config->stop);
+    psMetadataAddTime (where, PS_LIST_TAIL, "TIME_STOP", 0, ">", config->start);
     }
 
-    psArray *exposures = p2PendingExposureSelectRows (config->database, where, MAX_ROWS);
+    psArray *exposures = p2PendingExpSelectRowObjects (config->database, where, MAX_ROWS);
     psFree (where);
 
@@ -26,14 +34,14 @@
 
     // 'where' to select each exposure
-    psMetadata *where = psMetadataAlloc ();
+    where = psMetadataAlloc ();
     for (int i = 0; i < exposures->n; i++) {
-	p2PendingExposure *exposure = exposures->data[i];
+	p2PendingExpRow *exposure = exposures->data[i];
 	
-	psMetadataAddStr (where, PS_LIST_TAIL, "EXP_ID", PS_META_REPLACE, "==", exposure->expID);
-	psMetadataAddStr (where, PS_LIST_TAIL, "P2_VERSION", PS_META_REPLACE, "==", exposure->P2version);
+	psMetadataAddStr (where, PS_LIST_TAIL, "EXP_ID", PS_META_REPLACE, "==", exposure->exp_id);
+	psMetadataAddS32 (where, PS_LIST_TAIL, "P2_VERSION", PS_META_REPLACE, "==", exposure->p2_version);
 
-	psArray *images = ppPendingImageSelectRows (config->database, where, MAX_ROWS);
+	psArray *images = p2PendingImfileSelectRowObjects (config->database, where, MAX_ROWS);
 
-	ppPendingFrame *frame = ppPendingFrameAlloc (exposure, images);
+	p2PendingFrame *frame = p2PendingFrameAlloc (exposure, images);
 
 	psArrayAdd (frames, 100, frame);