Changeset 6257

Timestamp:

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

Author:

jhoblitt

Message:

merge pxalloc.c into pxframes.c
add PX_FRAME_ALLOC macro
add PX_FRAME_SEARCH macro

Location:

trunk/ippTools/src

Files:

• Makefile.am (modified) (4 diffs)
• pxalloc.c (deleted)
• pxframes.c (modified) (2 diffs)

trunk/ippTools/src/Makefile.am

@@ -1 @@
-bin_PROGRAMS = p2search pxadmin
+bin_PROGRAMS = pxadmin p0search p2search 
 
 include_HEADERS = pxtools.h
@@ -8 +8 @@
 libpxtools_la_SOURCES   = \
     p2searchDoneFrames.c \
-    pxalloc.c \
     p2insertPendingFrames.c \
     p2pendingToDone.c \
@@ -22 +21 @@
 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
+
 p2search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
 p2search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libpxtools.la
@@ -27 +32 @@
     p2search.c \
     p2searchConfig.c
+
 pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
 pxadmin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libpxtools.la

trunk/ippTools/src/pxframes.c

@@ -2 +2 @@
 
 #include "pxtools.h"
+
+#define PX_FRAME_ALLOC(frametype, exptype) \
+ \
+static void frametype##Free(frametype *ptr);\
+ \
+frametype *frametype##Alloc( \
+    exptype##Row *exposure, \
+    psArray *images \
+) \
+{ \
+    frametype *frame; \
+ \
+    PS_ASSERT_PTR_NON_NULL(exposure, NULL); \
+    PS_ASSERT_PTR_NON_NULL(images, NULL); \
+ \
+    frame = psAlloc(sizeof(frametype)); \
+    psMemSetDeallocator(frame, (psFreeFunc)frametype##Free); \
+ \
+    frame->exposure = exposure; \
+    frame->images   = images; \
+ \
+    return frame; \
+} \
+ \
+static void frametype##Free(frametype *ptr) \
+{ \
+    psFree(ptr->exposure); \
+    psFree(ptr->images); \
+}
+
+PX_FRAME_ALLOC(newFrame, newExp);
+PX_FRAME_ALLOC(rawScienceFrame, rawScienceExp);
+PX_FRAME_ALLOC(p2PendingFrame, p2PendingExp);
+PX_FRAME_ALLOC(p2DoneFrame, p2DoneExp);
 
 #define PX_FRAME_PRINT(frametype, imfiletype) \
@@ -35 +69 @@
 PX_FRAME_PRINT(rawScienceFrame, rawImfile);
 PX_FRAME_PRINT(p2PendingFrame, p2PendingImfile);
+
+
+#define PX_FRAME_SEARCH(frametype, exptype, imfiletype) \
+psArray *frametype##Search(pxConfig *config) \
+{ \
+    PS_ASSERT_PTR_NON_NULL(config, NULL); \
+ \
+    psArray *exposures = exptype##SelectRowObjects(config->database, \
+        config->where, MAX_ROWS); \
+    if (!exposures) { \
+        psError(PS_ERR_UNKNOWN, false, "no exptype rows found"); \
+ \
+        return NULL; \
+    } \
+ \
+    psArray *allFrames = psArrayAlloc(exposures->n); \
+    allFrames->n = 0; \
+ \
+    psMetadata *where = psMetadataAlloc (); \
+    for (int i = 0; i < exposures->n; i++) { \
+        exptype##Row *exposure = exposures->data[i]; \
+\
+        psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", PS_META_REPLACE, "==", \
+            exposure->exp_id); \
+ \
+        psArray *images = imfiletype##SelectRowObjects(config->database, where, \
+            MAX_ROWS); \
+        if (!images) { \
+            psError(PS_ERR_UNKNOWN, false, "database access failed"); \
+ \
+            return NULL; \
+        } \
+ \
+        frametype *frame = frametype##Alloc(exposure, images); \
+        psArrayAdd(allFrames, 100, frame); \
+    } \
+ \
+    return allFrames; \
+} 
+
+PX_FRAME_SEARCH(newFrame, newExp, newImfile);