Changeset 34692

Timestamp:

Nov 24, 2012, 4:07:15 PM (14 years ago)

Author:

eugene

Message:

need to truncate the image and catalog files when shinking the total amount of data in the file

Location:

branches/eam_branches/ipp-20120905/Ohana/src/libdvo/src

Files:

• dvo_catalog_split.c (modified) (3 diffs)
• fits_db.c (modified) (1 diff)

branches/eam_branches/ipp-20120905/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -83 +83 @@
     return (FALSE);
   }
+  off_t fullsize = catalog->header.datasize;
 
   // write the PHU matrix; this is probably a NOP, do I have to keep it in?
@@ -91 +92 @@
     return (FALSE);
   }
+  fullsize += matrix.datasize;
   gfits_free_matrix (&matrix);
 
@@ -98 +100 @@
     return (FALSE);
   }
+  fullsize += ftable->datasize + ftable->header->datasize;
+
+  // if the output file will be completely re-written, truncate to total datasize
+  if ((start == 0) && (Nrows == Ntotal)) {
+    int fd = fileno (catalog->f);
+    if (ftruncate (fd, fullsize)) {
+      perror ("dvo_catalog_save_subset: ");
+      return (FALSE);
+    }
+  }
+
   return (TRUE);
 }

branches/eam_branches/ipp-20120905/Ohana/src/libdvo/src/fits_db.c

@@ -159 +159 @@
   make_backup (db[0].filename);
   Fseek (db[0].f, 0, SEEK_SET);
+
+  int fd = fileno (db->f);
+  if (ftruncate (fd, 0)) {
+    perror ("gfits_db_save: ");
+    return (FALSE);
+  }
 
   if (!gfits_fwrite_header  (db[0].f, &db[0].header)) {