Changeset 4680 for trunk/Ohana/src/delstar/src/delete_times.c

Timestamp:

Jul 30, 2005, 9:14:00 AM (21 years ago)

Author:

eugene

Message:

adjust to use match DVO catalog access methods

File:

• trunk/Ohana/src/delstar/src/delete_times.c (modified) (2 diffs)

trunk/Ohana/src/delstar/src/delete_times.c

@@ -3 +3 @@
 void delete_times () {
 
-    Nregions = 0;
-    NREGIONS = 10;
-    ALLOCATE (region, GSCRegion, NREGIONS);
+  int i, j, k, n;
+  int Nimage, Nimlist, found, code;
+  int Ntregions, Nregions, NREGIONS;
+  int *imlist;
+  GSCRegion *region, *tregion;
+  Image *image;
+  Catalog catalog;
 
-    /* find image for time range, delete each image */ 
-    image = gtimes (&Nimage);
-    for (j = 0; j < Nimage; j++) {
-      fprintf (stderr, "finding regions for %s\n", image[j].name);
-      tregion = gregions (&image[j], &Ntregions);
-      for (i = 0; i < Ntregions; i++) {
-        found = FALSE;
-        for (k = 0; (k < Nregions) && !found; k++) {
-          found = !strcmp (region[k].filename, tregion[i].filename);
-        }
-        if (!found) {
-          strcpy (region[Nregions].filename, tregion[i].filename);
-          region[Nregions].RA[0] = tregion[i].RA[0];
-          region[Nregions].RA[1] = tregion[i].RA[1];
-          region[Nregions].DEC[0] = tregion[i].DEC[0];
-          region[Nregions].DEC[1] = tregion[i].DEC[1];
-          Nregions ++;
-          if (Nregions >= NREGIONS) {
-            NREGIONS += 10;
-            REALLOCATE (region, GSCRegion, NREGIONS);
-          }
+  code = (PHOTCODE == NULL) ? -1 : PHOTCODE[0].code;
+
+  Nregions = 0;
+  NREGIONS = 10;
+  ALLOCATE (region, GSCRegion, NREGIONS);
+
+  image = GetImages (&Nimage);
+
+  /* find images for time range, delete each image */ 
+  imlist = find_images_time (START, END, PHOTCODE, &Nimlist);
+
+  /* find all overlapping regions */
+  for (n = 0; n < Nimlist; n++) {
+    j = imlist[n];
+    if (VERBOSE) fprintf (stderr, "finding regions for %s\n", image[j].name);
+
+    tregion = gregion_image (&image[j], &Ntregions);
+    for (i = 0; i < Ntregions; i++) {
+      found = FALSE;
+      for (k = 0; (k < Nregions) && !found; k++) {
+        found = !strcmp (region[k].filename, tregion[i].filename);
+      }
+      if (!found) {
+        strcpy (region[Nregions].filename, tregion[i].filename);
+        region[Nregions].RA[0] = tregion[i].RA[0];
+        region[Nregions].RA[1] = tregion[i].RA[1];
+        region[Nregions].DEC[0] = tregion[i].DEC[0];
+        region[Nregions].DEC[1] = tregion[i].DEC[1];
+        Nregions ++;
+        if (Nregions >= NREGIONS) {
+          NREGIONS += 10;
+          REALLOCATE (region, GSCRegion, NREGIONS);
         }
       }
     }
-    for (i = 0; i < Nregions; i++) {
-      fprintf (stderr, "deleting from %s\n", region[i].filename);
-      catalog.filename = region[i].filename;  /* don't free region before catalog! */
-      switch (lock_catalog (&catalog, LCK_SOFT)) {
+    free (tregion);
+  }
+
+  /* delete from all identified regions */
+  for (i = 0; i < Nregions; i++) {
+    if (VERBOSE) fprintf (stderr, "deleting from %s\n", region[i].filename);
+    catalog.filename = region[i].filename;  /* don't free region before catalog! */
+    switch (lock_catalog (&catalog, LCK_XCLD)) {
       case 0:
         fprintf (stderr, "ERROR: can't lock file\n");
@@ -43 +62 @@
       case 2:
         fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
-        catalog.Naverage = 0;
-        catalog.Nmeasure = 0;
-        break;
+        unlock_catalog (&catalog);
+        continue;
       default:
         fprintf (stderr, "weird lock_catalog exit state\n");
         exit (1);
-      }
-      find_matches (&catalog, &image[0], start, end);
-      wcatalog (&catalog);
     }
-    dimages (image, Nimage);
-    fprintf (stderr, "SUCCESS\n");
-    exit (0);
+
+    find_matches (&catalog, code, START, END);
+    wcatalog (&catalog);
+    unlock_catalog (&catalog);
+  }
+
+  /* delete the identified images */
+  dimages (imlist, Nimlist); 
+
+  save_image_db ();
+  unlock_image_db ();
+  fprintf (stderr, "SUCCESS\n");
+  exit (0);
 }