Changeset 6060 for trunk/ippTools/src/p2rawToPending.c

Timestamp:

Jan 19, 2006, 4:16:26 PM (21 years ago)

Author:

jhoblitt

Message:

compilation fixes
switch to using the metadatadb API

File:

• trunk/ippTools/src/p2rawToPending.c (modified) (2 diffs)

trunk/ippTools/src/p2rawToPending.c

@@ -2 +2 @@
 
 // select pending frames (exposure+images) which are done/not done
-psArray *p2rawToPending (p2SearchConfig *config, psArray *rawFrames) {
+psArray *p2rawToPending (p2Config *config, psArray *rawFrames) {
 
-    psArray *pendingFrames = psArrayAlloc (frames->n);
+    psArray *pendingFrames = psArrayAlloc (rawFrames->n);
     pendingFrames->n = 0;
 
@@ -10 +10 @@
         ppRawFrame *rawFrame = rawFrames->data[i];
 
-        p2PendingExposure *pendingExposure = p2PendingExposureAlloc ();
-        strcpy (pendingExposure->expID, rawFrame->exposure->expID);
-        pendingExposure->class = rawFrame->exposure->class;
-        pendingExposure->Nclass = rawFrame->exposure->Nclass;
-        pendingExposure->Ndone = 0;
-        pendingExposure->P1version = 0xff;
-        pendingExposure->P2version = 0xff;
-        pendingExposure->state = P2_STATE_PENDING;
+        p2PendingExpRow *pendingExposure = p2PendingExpRowAlloc(
+            rawFrame->exposure->exp_id,
+            rawFrame->exposure->class,
+            rawFrame->exposure->nclass,
+            0xff,   // p1
+            0xff    // p2
+    );
 
         psArray *pendingImages = psArrayAlloc (rawFrame->images->n);
         pendingImages->n = 0;
         for (int j = 0; j < rawFrame->images->n; j++) {
-            ppRawImage *rawImage = rawFrame->images->data[j];
-            p2PendingImage *pendingImage = p2PendingImageAlloc ();
-
-            strcpy (pendingImage->expID, rawImage->expID);
-            pendingImage->P2version = 0xff;
-            pendingImage->class = rawImage->;
-            strcpy (pendingImage->classID, rawImage->classID);
-
-            pendingImage->urlroot = rawImage->;
-            strcpy (pendingImage->input, "raw.fits");
-            strcpy (pendingImage->output, "flt.fits");
-            strcpy (pendingImage->log, "log");
-            strcpy (pendingImage->smf, "smf");
-            pendingImage->state = P2_STATE_PENDING;
+            rawImfileRow *rawImage = rawFrame->images->data[j];
+            p2PendingImfileRow *pendingImage = p2PendingImfileRowAlloc(
+                rawImage->exp_id,
+                rawImage->class,
+                rawImage->class_id,
+                0xff,   // p1
+                0xff,   // p2
+            "",     // recipe
+            "",     // stats
+                rawImage->url
+        );
 
             psArrayAdd (pendingImages, 100, pendingImage);