Changeset 6156

Timestamp:

Jan 21, 2006, 7:07:56 PM (20 years ago)

Author:

jhoblitt

Message:

add p2pendingToDoneImfile()
add p2searchPendingImfiles()

Location:

trunk/ippTools/src

Files:

• p2pendingToDone.c (modified) (1 diff)
• p2searchPendingFrames.c (modified) (3 diffs)
• pxtools.h (modified) (1 diff)

trunk/ippTools/src/p2pendingToDone.c

@@ -61 +61 @@
 
 // XXX the filename layout is defined by this code
+psArray *p2pendingToDoneImfile(psArray *pendingImfiles)
+{
+    PS_ASSERT_PTR_NON_NULL(pendingImfiles, NULL);
+
+    psArray *doneImfiles = psArrayAlloc(pendingImfiles->n);
+    doneImfiles->n = 0;
+
+    for (int i = 0; i < pendingImfiles->n; i++) {
+        p2PendingImfileRow *pendingImfile = pendingImfiles->data[i];
+
+        p2DoneImfileRow *doneImfile = p2DoneImfileRowAlloc(
+            pendingImfile->exp_id,
+            pendingImfile->exptype,
+            pendingImfile->class,
+            pendingImfile->class_id,
+            pendingImfile->p1_version,
+            pendingImfile->p2_version,
+            "", // recipe
+            "", // stats
+            pendingImfile->url
+        );
+
+        psArrayAdd(doneImfiles, 100, doneImfile);
+    }
+
+    return doneImfiles;
+}

trunk/ippTools/src/p2searchPendingFrames.c

@@ -18 +18 @@
     }
     /*
+    if (config->exp_id != NULL) {
+        psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", 0, "==",
+            config->exp_id);
+    }
+    if (config->class != NULL) {
+        psMetadataAddStr(where, PS_LIST_TAIL, "class", 0, "==",
+            config->class);
+    }
+    if (config->class_id != NULL) {
+        psMetadataAddStr(where, PS_LIST_TAIL, "class_id", 0, "==",
+            config->class_id);
+    }
+    */
+    /*
     if (!psTimeIsZero(config->start) && !psTimeIsZero(config->stop)) {
         psMetadataAddTime(where, PS_LIST_TAIL, "TIME_START", 0, "<", config->stop);
@@ -26 +40 @@
     psArray *exposures = p2PendingExpSelectRowObjects(config->database, where, MAX_ROWS);
     psFree(where);
+    if (!exposures) {
+        psError(PS_ERR_UNKNOWN, false, "no p2PendingExp rows found");
+        return NULL;
+    }
+
 
     // output array of rawSet
@@ -52 +71 @@
 // which have the appropriate state.  that would limit the ability to filter
 // the selection.  test to see how well/poorly this performs
+
+psArray *p2searchPendingImfiles(p2Config *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+
+    psMetadata *where = psMetadataAlloc();
+    if (config->camera_name != NULL) {
+        if (!psMetadataAddStr(where, PS_LIST_TAIL, "camera", 0, "==",
+            config->camera_name)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item camera");
+            psFree(where);
+            return NULL;
+        }
+    }
+    if (config->filter != NULL) {
+        psMetadataAddStr(where, PS_LIST_TAIL, "filter", 0, "==",
+            config->filter);
+    }
+    if (config->exp_id != NULL) {
+        psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", 0, "==",
+            config->exp_id);
+    }
+    if (config->class != NULL) {
+        psMetadataAddStr(where, PS_LIST_TAIL, "class", 0, "==",
+            config->class);
+    }
+    if (config->class_id != NULL) {
+        psMetadataAddStr(where, PS_LIST_TAIL, "class_id", 0, "==",
+            config->class_id);
+    }
+
+    psArray *imfiles = p2PendingImfileSelectRowObjects(config->database, where,
+        MAX_ROWS);
+    psFree(where);
+
+    return imfiles;
+}

trunk/ippTools/src/pxtools.h

@@ -91 +91 @@
 bool p2writePendingFrames (p2Config *config, psArray *frames);
 psArray *p2searchDoneFrames(p2Config *config);
+psArray *p2searchPendingImfiles(p2Config *config);
+psArray *p2pendingToDoneImfile(psArray *pendingImfiles);