Changeset 6083 for trunk/ippTools/src

Timestamp:

Jan 20, 2006, 11:11:25 AM (21 years ago)

Author:

jhoblitt

Message:

fix column names
more cleanup

Location:

trunk/ippTools/src

Files:

• p2rawToPending.c (modified) (1 diff)
• p2searchRawFrames.c (modified) (5 diffs)

trunk/ippTools/src/p2rawToPending.c

@@ -4 +4 @@
 psArray *p2rawToPending (p2Config *config, psArray *rawFrames) {
 
-    psArray *pendingFrames = psArrayAlloc (rawFrames->n);
+    psArray *pendingFrames = psArrayAlloc(rawFrames->n);
     pendingFrames->n = 0;
 

trunk/ippTools/src/p2searchRawFrames.c

@@ -2 +2 @@
 
 // select raw frames (exposure+images) which match the given config options
-psArray *p2searchRawFrames (p2Config *config) {
+psArray *p2searchRawFrames(p2Config *config) {
 
     // build 'where' structure
     psMetadata *where = psMetadataAlloc ();
 
-    psMetadataAddS32  (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_name);
+        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);
     }
     // psMetadataConfig does not support times yet
@@ -23 +23 @@
     */
 
-    psArray *exposures = rawScienceExpSelectRowObjects (config->database, where, MAX_ROWS);
+    psArray *exposures = rawScienceExpSelectRowObjects(config->database, where, 
+        MAX_ROWS);
     psFree (where);
     if (!exposures) {
@@ -32 +33 @@
 
     // output array of ppRawFrame
-    psArray *frames = psArrayAlloc (exposures->n);
+    psArray *frames = psArrayAlloc(exposures->n);
 
     // 'where' to select each exposure
@@ -39 +40 @@
         rawScienceExpRow *exposure = exposures->data[i];
 
-        psMetadataAddStr (where, PS_LIST_TAIL, "EXP_ID", PS_META_REPLACE, "==", exposure->exp_id);
+        psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", PS_META_REPLACE, "==",
+            exposure->exp_id);
 
-        psArray *images = rawImfileSelectRowObjects (config->database, where, MAX_ROWS);
+        psArray *images = rawImfileSelectRowObjects(config->database, where,
+            MAX_ROWS);
         if (!images) {
             psError(PS_ERR_UNKNOWN, false, "database access failed");
@@ -48 +51 @@
         }
 
-        ppRawFrame *frame = ppRawFrameAlloc (exposure, images);
-        psArrayAdd (frames, 100, frame);
+        ppRawFrame *rawFrame = ppRawFrameAlloc(exposure, images);
+        psArrayAdd(frames, 100, rawFrame);
     }