Index: trunk/ippTools/src/p2searchRawFrames.c
===================================================================
--- trunk/ippTools/src/p2searchRawFrames.c	(revision 6032)
+++ trunk/ippTools/src/p2searchRawFrames.c	(revision 6060)
@@ -2,13 +2,13 @@
 
 // select raw frames (exposure+images) which match the given config options
-psArray p2searchRawImages (p2SearchConfig *config) {
+psArray *p2searchRawFrames (p2Config *config) {
 
     // build 'where' structure
     psMetadata *where = psMetadataAlloc ();
 
-    psMetadataAddU8  (where, PS_LIST_TAIL, "TYPE",  0, "==", P2_TYPE_OBJECT);
+    psMetadataAddS32  (where, PS_LIST_TAIL, "TYPE",  0, "==", P2_TYPE_OBJECT);
 
     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) {
@@ -16,9 +16,9 @@
     }
     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 = ppRawExposureSelectRows (config->database, where, MAX_ROWS);
+    psArray *exposures = rawScienceExpSelectRowObjects (config->database, where, MAX_ROWS);
     psFree (where);
 
@@ -27,11 +27,11 @@
 
     // 'where' to select each exposure
-    psMetadata *where = psMetadataAlloc ();
+    where = psMetadataAlloc ();
     for (int i = 0; i < exposures->n; i++) {
-	ppRawExposure *exposure = exposures->data[i];
+	rawScienceExpRow *exposure = exposures->data[i];
 	
-	psMetadataAddStr (where, PS_LIST_TAIL, "EXP_ID", PS_META_REPLACE, "==", exposure->expID);
+	psMetadataAddStr (where, PS_LIST_TAIL, "EXP_ID", PS_META_REPLACE, "==", exposure->exp_id);
 
-	psArray *images = ppRawImageSelectRows (config->database, where, MAX_ROWS);
+	psArray *images = rawImfileSelectRowObjects (config->database, where, MAX_ROWS);
 
 	ppRawFrame *frame = ppRawFrameAlloc (exposure, images);