Changeset 7843

Timestamp:

Jul 7, 2006, 2:37:48 PM (20 years ago)

Author:

jhoblitt

Message:

fix PX_FRAME_SEARCH() to handle missing imfiles

File:

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

trunk/ippTools/src/pxframes.c

@@ -96 +96 @@
     allFrames->n = 0; \
  \
-    for (int i = 0; i < exposures->n; i++) { \
+    for (int i = 0; i < psArrayLength(exposures); i++) { \
         exptype##Row *exposure = exposures->data[i]; \
 \
-        psMetadata *where = psMetadataAlloc (); \
+        psMetadata *where = psMetadataAlloc(); \
         psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", PS_META_REPLACE, "==", \
             exposure->exp_id); \
@@ -107 +107 @@
         psFree(where); \
         if (!images) { \
-            psError(PS_ERR_UNKNOWN, false, "no " #imfiletype " rows found"); \
-            psFree(allFrames); \
- \
-            return NULL; \
+            psError(PS_ERR_UNKNOWN, false, "no " #imfiletype " rows found for exp_id %s", exposure->exp_id); \
+ \
+            continue; \
         } \
  \
         frametype *frame = frametype##Alloc(exposure, images); \
         psArrayAdd(allFrames, 100, frame); \
+    } \
+ \
+    if (!psArrayLength(allFrames)) { \
+        psFree(allFrames); \
+        allFrames = NULL; \
     } \
  \