Changeset 35727

Timestamp:

Jul 1, 2013, 10:22:45 AM (13 years ago)

Author:

eugene

Message:

test for imageID out of range; only update catalogs which have been modified (logic here was wrong previously)

Location:

branches/eam_branches/ipp-20130509/Ohana/src/delstar

Files:

• include/delstar.h (modified) (1 diff)
• src/ImageOpsFixLAP.c (modified) (3 diffs)
• src/delete_fix_LAP.c (modified) (4 diffs)

branches/eam_branches/ipp-20130509/Ohana/src/delstar/include/delstar.h

@@ -155 +155 @@
 
 void initImageIndex (ImageSubset *image, off_t Nimage_init);
-int *getImageIndex ();
+int *getImageIndex (int *maxIndex);
 int FindIDexp (off_t *ID, off_t *Seq, e_time time, short photcode);
 int FindIDstk (off_t *ID, off_t *Seq, short *photcode, off_t extID);

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/ImageOpsFixLAP.c

@@ -14 +14 @@
 unsigned int *imageSeq_stk = NULL;
 
+int maxID = 0;
 int *imageIndex = NULL;
 
@@ -44 +45 @@
   memset (Nimage_invalid, 0, sizeof(int)*Nimage);
 
-  int maxID = 0;
-
   // save the image data in the local static arrays
   for (i = 0; i < Nimage; i++) {
@@ -85 +84 @@
 }
 
-int *getImageIndex () {
+int *getImageIndex (int *maxIDout) {
+  *maxIDout = maxID;
   return imageIndex;
 }

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/delete_fix_LAP.c

@@ -64 +64 @@
 
     // skip if nothing was deleted
-    if (UPDATE && (NaverageStart == catalog.Naverage) && (NmeasureStart == catalog.Nmeasure)) {
+    int noChange = (NaverageStart == catalog.Naverage) && (NmeasureStart == catalog.Nmeasure);
+    if (UPDATE && !noChange) {
       dvo_catalog_save_complete (&catalog, VERBOSE2);
     }
@@ -518 +519 @@
   }
 
-  int *imageIndex = getImageIndex();
+  int maxID = 0;
+  int *imageIndex = getImageIndex(&maxID);
 
   // check the image IDs for the remaining measures
@@ -532 +534 @@
         resetID = TRUE;
         goto resetID_exp;
+      }
+      if (imageID > maxID) {
+        fprintf (stderr, "invalid image ID "OFF_T_FMT" for catalog %s\n", imageID, catalog[0].filename);
+        exit (2);
       }
       off_t imageN = imageIndex[imageID];
@@ -587 +593 @@
         goto resetID_stk;
       }
+      if (imageID > maxID) {
+        fprintf (stderr, "invalid image ID "OFF_T_FMT" for catalog %s\n", imageID, catalog[0].filename);
+        exit (2);
+      }
 
       off_t imageN = imageIndex[imageID];