Changeset 6086 for trunk/ippTools/src/p2pendingToDone.c

Timestamp:

Jan 20, 2006, 11:47:20 AM (20 years ago)

Author:

jhoblitt

Message:

table field updates
more cleanups

File:

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

trunk/ippTools/src/p2pendingToDone.c

@@ -2 +2 @@
 
 // select pending frames (exposure+images) which are done/not done
-psArray *p2pendingToDone (p2Config *config, psArray *pendingFrames) {
+psArray *p2pendingToDone(p2Config *config, psArray *pendingFrames) {
 
     psArray *doneFrames = psArrayAlloc(pendingFrames->n);
@@ -9 +9 @@
     for (int i = 0; i < pendingFrames->n; i++) {
         p2PendingFrame *pendingFrame = pendingFrames->data[i];
-//      if (pendingFrame->exposure->state != P2_STATE_DONE) continue;
+// if (pendingFrame->exposure->state != P2_STATE_DONE) continue;
 
-        p2DoneExpRow *doneExposure = p2DoneExpRowAlloc(
-            pendingFrame->exposure->exp_id,
-            pendingFrame->exposure->class,
-            pendingFrame->exposure->nclass,
-            pendingFrame->exposure->nclass, // XXX ndone is uneeded?
-            pendingFrame->exposure->p1_version,
-            pendingFrame->exposure->p2_version
-        //doneExposure->state = P2_STATE_DONE;
-    );
+        p2DoneExpRow *doneExposure = p2DoneExpRowAlloc(
+            pendingFrame->exposure->exp_id,
+            pendingFrame->exposure->camera,
+            pendingFrame->exposure->filter,
+            pendingFrame->exposure->class,
+            pendingFrame->exposure->nclass, // XXX ndone is uneeded?
+            0xFF, // ndone
+            pendingFrame->exposure->p1_version,
+            pendingFrame->exposure->p2_version
+            //doneExposure->state = P2_STATE_DONE;
+        );
 
-        psArray *doneImages = psArrayAlloc (pendingFrame->images->n);
-        doneImages->n = 0;
-        for (int j = 0; j < pendingFrame->images->n; j++) {
-            p2PendingImfileRow *pendingImage = pendingFrame->images->data[j];
+        psArray *doneImages = psArrayAlloc(pendingFrame->images->n);
+        doneImages->n = 0;
+        for (int j = 0; j < pendingFrame->images->n; j++) {
+        p2PendingImfileRow *pendingImage = pendingFrame->images->data[j];
 
         /*
-            if (pendingImage->state != P2_STATE_DONE) {
-                psAbort ("p2search", "programming error!");
-            }
+        if (pendingImage->state != P2_STATE_DONE) {
+            psAbort ("p2search", "programming error!");
+        }
         */
 
-            p2DoneImfileRow *doneImage = p2DoneImfileRowAlloc(
-                pendingImage->exp_id,
-                pendingImage->class,
-                pendingImage->class_id,
-                pendingImage->p1_version,
-                pendingImage->p2_version,
+        p2DoneImfileRow *doneImage = p2DoneImfileRowAlloc(
+            pendingImage->exp_id,
+            pendingImage->exptype,
+            pendingImage->class,
+            pendingImage->class_id,
+            pendingImage->p1_version,
+            pendingImage->p2_version,
             "", // recipe
             "", // stats
-                pendingImage->url
+            pendingImage->url
         );
 
-            psArrayAdd (doneImages, 100, doneImage);
-        }
-        
-    // XXX FIXME
-        p2DoneFrame *doneFrame = p2DoneFrameAlloc(doneExposure, doneImages);
+        psArrayAdd(doneImages, 100, doneImage);
+}
 
-        psArrayAdd (doneFrames, 100, doneFrame);
+        // XXX FIXME
+        p2DoneFrame *doneFrame = p2DoneFrameAlloc(doneExposure, doneImages);
+
+        psArrayAdd(doneFrames, 100, doneFrame);
     }
+
     return doneFrames;
-} 
+}
 
 // XXX the filename layout is defined by this code