Changeset 6238

Timestamp:

Jan 29, 2006, 9:09:54 AM (20 years ago)

Author:

eugene

Message:

moved image lock/unlock to libdvo

Location:

trunk/Ohana/src

Files:

• photdbc/src/image-db.c (modified) (1 diff)
• photdbc/src/load_images.c (modified) (1 diff)
• photdbc/src/photdbc.c (modified) (2 diffs)
• uniphot/src/image-db.c (modified) (1 diff)
• uniphot/src/load_images.c (modified) (1 diff)
• uniphot/src/uniphot.c (modified) (3 diffs)

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

@@ -1 +1 @@
 # include "photdbc.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/photdbc/src/load_images.c

@@ -11 +11 @@
   region = name_region (seed, &Nregion);
 
-  if (db[0].dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db[0].filename);
-
   /* read entire db table */
   if (!dvo_image_load (db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db[0].filename);

trunk/Ohana/src/photdbc/src/photdbc.c

@@ -3 +3 @@
 int main (int argc, char **argv) {
 
-  int Nregion;
+  int Nregion, status;
   char filename[1024];
   Catalog *catalog;
@@ -13 +13 @@
 
   set_db (&db);
-  lock_image_db (&db, ImageCat);
+  status = dvo_image_lock (&db, ImageCat, 60.0, LCK_XCLD); /* XCLD */
+  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);
 
   /* load region and images overlapping region */

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

@@ -1 +1 @@
 # include "uniphot.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/uniphot/src/load_images.c

@@ -5 +5 @@
   if (VERBOSE) fprintf (stderr, "finding images\n");
 
-  if (db[0].dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db[0].filename);
-
   /* read entire db table */
   if (!dvo_image_load (db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db[0].filename);

trunk/Ohana/src/uniphot/src/uniphot.c

@@ -3 +3 @@
 int main (int argc, char **argv) {
 
-  int i, Ntgroup, Nsgroup;
+  int i, Ntgroup, Nsgroup, status;
   Group *tgroup, *sgroup;
   ImageLink *imlinks;
@@ -12 +12 @@
 
   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 images */
@@ -46 +49 @@
              sgroup[i].Nimage, sgroup[i].Ngood, 0.001*sgroup[i].M, 0.001*sgroup[i].dM, 0.001*sgroup[i].dMsub);
   }
-
   if (!UPDATE) exit (0);
 
   update (&db, sgroup, Nsgroup);
-  unlock_image_db (&db); 
+  dvo_image_unlock (&db); 
 
   exit (0);