Changeset 6237 for trunk/Ohana/src/relphot

Timestamp:

Jan 29, 2006, 8:57:11 AM (20 years ago)

Author:

eugene

Message:

moved image lock/unlock to libdvo

Location:

trunk/Ohana/src/relphot/src

Files:

• image-db.c (modified) (1 diff)
• load_images.c (modified) (1 diff)
• relphot.c (modified) (3 diffs)

trunk/Ohana/src/relphot/src/image-db.c

@@ -1 +1 @@
 # include "relphot.h"
 
-void lock_image_db (FITS_DB *db, char *filename) {
-
-  /* lock the image catalog */
-  check_permissions (filename);
-
-  db[0].lockstate = LCK_XCLD;
-  db[0].timeout   = 3600.0;
-  fits_db_init (db);
-
-  if (!fits_db_lock (db, filename)) {
-    fprintf (stderr, "ERROR: can't lock image catalog\n");
-    exit (1);
-  }
-}
-
-void unlock_image_db (FITS_DB *db) {
-
-  mode_t mode;
-
-  fits_db_close (db);
-
-  /* force permissions to 666 */
-  mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
-  chmod (db[0].filename, mode);
-}

trunk/Ohana/src/relphot/src/load_images.c

@@ -8 +8 @@
   int       *Line;
   int        Nimage;
-
-  if (db[0].dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db[0].filename);
 
   /* read entire db table */

trunk/Ohana/src/relphot/src/relphot.c

@@ -4 +4 @@
 int main (int argc, char **argv) {
 
-  int i, Ncatalog;
+  int i, status, Ncatalog;
   Catalog *catalog;
   GSCRegion fullregion, *region;
@@ -13 +13 @@
 
   set_db (&db);
-  lock_image_db (&db, ImageCat);
+  status = dvo_image_lock (&db, ImageCat, 60.0, (UPDATE ? LCK_XCLD : LCK_SOFT));
+  if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
+  if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
+  if (!UPDATE) dvo_image_unlock (&db); 
 
   /* load regions and images based on seed region */
@@ -86 +89 @@
   setMcalFinal ();
   dvo_image_update (&db, VERBOSE);
-  unlock_image_db (&db); 
+  dvo_image_unlock (&db); 
 
   exit (0);