Changeset 12725

Timestamp:

Apr 3, 2007, 10:51:30 AM (19 years ago)

Author:

eugene

Message:

delete imagename was not removing image from image table

File:

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

trunk/Ohana/src/delstar/src/delete_imagename.c

@@ -4 +4 @@
 
   int i, j, k;
-  int Nimlist, Nimage;
+  int Nimlist, Nimage, Noutimage;
   int *imlist;
   double trange;
   time_t start, stop;
   Image *image;
+  Image *outimage;
   Catalog catalog;
   SkyList *skylist;
@@ -63 +64 @@
 
   /* delete the identified images */
-  gfits_vtable_from_ftable (&db[0].ftable, &db[0].vtable, imlist, Nimlist);
-  dvo_image_update (db, VERBOSE);
+  ALLOCATE (outimage, Image, Nimage - Nimlist);
+  for (i = 0, k = 0; i < Nimage; i++) {
+      for (j = 0; j < Nimlist; j++) {
+          if (imlist[j] == i) goto skip;
+      }
+      outimage[k] = image[i];
+      k++;
+  skip:
+      continue;
+  }
+  free (image);
+  Noutimage = Nimage - Nimlist;
+  
+  if (VERBOSE) fprintf (stderr, "removing %d images (leaving %d of %d)\n", Nimlist, Noutimage, Nimage);
+  // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage);
+
+  gfits_modify (&db[0].theader, "NAXIS2", "%d", 1, Noutimage);
+  gfits_modify (&db[0].header, "NIMAGES", "%d", 1, Noutimage);
+  db[0].theader.Naxis[1] = Noutimage;
+  db[0].ftable.buffer = outimage;
+
+  dvo_image_save (db, VERBOSE);
   dvo_image_unlock (db);