Changeset 6258

Timestamp:

Jan 30, 2006, 5:47:19 PM (20 years ago)

Author:

jhoblitt

Message:

rename:

p2searchRawFrames() -> rawScienceFrameSearch()
p2searchPendingFrames() -> p2PendingFrameSearch()

merge p2searchRawFrames.c into pxframes.c (replaced by macro)
add p0 types

Location:

trunk/ippTools/src

Files:

• Makefile.am (modified) (2 diffs)
• chiptool.c (modified) (4 diffs)
• p2searchPendingFrames.c (modified) (1 diff)
• pxframes.c (modified) (1 diff)
• pxtools.h (modified) (4 diffs)

trunk/ippTools/src/Makefile.am

@@ -1 @@
-bin_PROGRAMS = pxadmin p0search p2search 
+bin_PROGRAMS = pxadmin p2search  p0search
 
 include_HEADERS = pxtools.h
@@ -12 +12 @@
     p2rawToPending.c \
     p2searchPendingFrames.c \
-    p2searchRawFrames.c \
     p2updatePending.c \
         pxframes.c \
     pxtables.c
 
-
 # for pxtools.h
 AM_CPPFLAGS = -I$(top_srcdir)/src$
 
-p0search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
-p0search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libpxtools.la
-p0search_SOURCES = \
-    p0search.c \
-    p0searchConfig.c
+#p0search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
+#p0search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libpxtools.la
+#p0search_SOURCES = \
+#    p0search.c \
+#    p0searchConfig.c
 
 p2search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)

trunk/ippTools/src/chiptool.c

@@ -51 +51 @@
 static bool quickMode(pxConfig *config)
 {
-    psArray *rawFrames = p2searchRawFrames(config);
+    psArray *rawFrames = rawScienceFrameSearch(config);
     if (!rawFrames) {
         psError(PS_ERR_UNKNOWN, false, "no rawScienceFrames found");
@@ -67 +67 @@
 static bool defineMode(pxConfig *config)
 {
-    psArray *rawFrames = p2searchRawFrames(config);
+    psArray *rawFrames = rawScienceFrameSearch(config);
     if (!rawFrames) {
         psError(PS_ERR_UNKNOWN, false, "no rawScienceFrames found");
         return false;
     }
-    psArray *pendingFrames = p2searchPendingFrames(config);
+    psArray *pendingFrames = p2PendingFrameSearch(config);
     // XXX compare raw frames to pending frames and remove duplicate 
     // frames from the raw set.  This may not be quiet right as it's
@@ -94 +94 @@
 
         psFree(pendingFrames);
-    }
-
-    psArray *doneFrames = p2searchDoneFrames(config);
-    if (doneFrames && (rawFrames->n > 0)) {
-        for (int i = 0; i < rawFrames->n; i++) {
-            rawScienceFrame *rawFrame = rawFrames->data[i];
-            for (int j = 0; j < pendingFrames->n; j++) {
-                p2DoneFrame *doneFrame = pendingFrames->data[j];
-                if (strcmp(rawFrame->exposure->exp_id,
-                           doneFrame->exposure->exp_id) == 0) {
-                    psArrayRemove(rawFrames, rawFrame);
-                    // dec the counter as the array just got shorter
-                    // and we don't want to skip elemnts
-                    i--;
-                    break;
-                } 
-            }
-        }
-
-        psFree(doneFrames);
+
+        psArray *doneFrames = p2searchDoneFrames(config);
+        if (doneFrames && (rawFrames->n > 0)) {
+            for (int i = 0; i < rawFrames->n; i++) {
+                rawScienceFrame *rawFrame = rawFrames->data[i];
+                for (int j = 0; j < pendingFrames->n; j++) {
+                    p2DoneFrame *doneFrame = pendingFrames->data[j];
+                    if (strcmp(rawFrame->exposure->exp_id,
+                               doneFrame->exposure->exp_id) == 0) {
+                        psArrayRemove(rawFrames, rawFrame);
+                        // dec the counter as the array just got shorter
+                        // and we don't want to skip elemnts
+                        i--;
+                        break;
+                    } 
+                }
+            }
+
+            psFree(doneFrames);
+        }
     }
 
@@ -133 +133 @@
 static bool pendingMode(pxConfig *config)
 {
-    psArray *pendingFrames = p2searchPendingFrames(config);
+    psArray *pendingFrames = p2PendingFrameSearch(config);
     if (!pendingFrames) {
         psError(PS_ERR_UNKNOWN, false, "no p2PendingFrames found");

trunk/ippTools/src/p2searchPendingFrames.c

@@ -2 +2 @@
 
 // select pending frames (exposure+images) which are done/not done
-psArray *p2searchPendingFrames(pxConfig *config) {
+psArray *p0searchPendingFrames(pxConfig *config) {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 

trunk/ippTools/src/pxframes.c

@@ -110 +110 @@
 
 PX_FRAME_SEARCH(newFrame, newExp, newImfile);
+PX_FRAME_SEARCH(rawScienceFrame, rawScienceExp, rawImfile);
+PX_FRAME_SEARCH(p2PendingFrame, p2PendingExp, p2PendingImfile);

trunk/ippTools/src/pxtools.h

@@ -14 +14 @@
 # define RECIPE "PHASE2"
 # define MAX_ROWS 10e9
+
+typedef enum {
+    P0_MODE_NONE,                               
+    P0_MODE_PENDING,                            // grab from new
+    P0_MODE_UPDATE,                         // grab from new, create raw
+} p0mode;
+
+typedef struct {
+    p0mode mode;
+    psTime *start;
+    psTime *stop;
+    psMetadata *camera;
+    psDB *database;
+    psMetadata *site;
+    psMetadata *recipe;
+    psMetadata *arguments;
+    char *camera_name;
+    char *filter;
+    char *exp_id;
+    char *class;
+    char *class_id;
+    char *url;
+    psMetadata *where;
+} p0Config;
 
 typedef enum {
@@ -46 +70 @@
     psMetadata *where;
 } pxConfig;
+
+typedef struct {
+    newExpRow *exposure;
+    psArray *images;
+} newFrame;
+
+newFrame *newFrameAlloc(
+    newExpRow *exposure,
+    psArray *images
+);
 
 typedef struct {
@@ -83 +117 @@
 
 psArray *p2rawToPending (pxConfig *config, psArray *rawFrames);
-psArray *p2searchRawFrames (pxConfig *config);
 bool p2insertPendingFrames (pxConfig *config, psArray *rawFrames);
-psArray *p2searchPendingFrames (pxConfig *config);
 bool p2writePendingImages (pxConfig *config, psArray *frames);
 bool p2updatePendingFrames (pxConfig *config, psArray *pendingFrames);
@@ -95 +127 @@
 psArray *p2searchPendingExp(pxConfig *config);
 p2DoneExpRow *p2pendingToDoneExp(p2PendingExpRow *pendingExp);
+
 bool rawScienceFramePrint(FILE *stream, pxConfig *config, psArray *frames);
+psArray *rawScienceFrameSearch(pxConfig *config);
+
 bool p2PendingFramePrint(FILE *stream, pxConfig *config, psArray *frames);
+psArray *p2PendingFrameSearch(pxConfig *config);