IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6237


Ignore:
Timestamp:
Jan 29, 2006, 8:57:11 AM (20 years ago)
Author:
eugene
Message:

moved image lock/unlock to libdvo

Location:
trunk/Ohana/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/delstar/src/delete_imagefile.c

    r5945 r6237  
    5757  fits_vtable_from_ftable (&db[0].ftable, &db[0].vtable, imlist, Nimlist);
    5858  dvo_image_update (db, VERBOSE);
    59   unlock_image_db (db);
     59  dvo_image_unlock (db);
    6060
    6161  fprintf (stderr, "SUCCESS\n");

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

    r5945 r6237  
    6565  fits_vtable_from_ftable (&db[0].ftable, &db[0].vtable, imlist, Nimlist);
    6666  dvo_image_update (db, VERBOSE);
    67   unlock_image_db (db);
     67  dvo_image_unlock (db);
    6868
    6969  fprintf (stderr, "SUCCESS\n");

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

    r5945 r6237  
    7979  fits_vtable_from_ftable (&db[0].ftable, &db[0].vtable, imlist, Nimlist);
    8080  dvo_image_update (db, VERBOSE);
    81   unlock_image_db (db);
     81  dvo_image_unlock (db);
    8282
    8383  fprintf (stderr, "SUCCESS\n");

  • trunk/Ohana/src/delstar/src/delstar.c

    r4864 r6237  
    1010
    1111  set_db (&db);
    12   lock_image_db (&db, ImageCat);
    13   load_image_db (&db);
     12  status = dvo_image_lock (&db, ImageCat, 60.0, LCK_XCLD); /* XCLD */
     13  if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db[0].filename);
     14  if (db[0].dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db[0].filename);
     15
     16  status = dvo_image_load (&db, VERBOSE, FALSE);
     17  if (!status) Shutdown ("can't read image catalog %s", db[0].filename);
    1418
    1519  switch (MODE) {

  • trunk/Ohana/src/delstar/src/image-db.c

    r4864 r6237  
    11# include "delstar.h"
    2 
    3 void lock_image_db (FITS_DB *db, char *filename) {
    4 
    5   /* lock the image catalog */
    6   check_permissions (filename);
    7 
    8   db[0].lockstate = LCK_XCLD;
    9   db[0].timeout   = 3600.0;
    10   fits_db_init (db);
    11 
    12   if (!fits_db_lock (db, filename)) {
    13     fprintf (stderr, "ERROR: can't lock image catalog\n");
    14     exit (1);
    15   }
    16 }
    17 
    18 void unlock_image_db (FITS_DB *db) {
    19 
    20   mode_t mode;
    21 
    22   fits_db_close (db);
    23 
    24   /* force permissions to 666 */
    25   mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
    26   chmod (db[0].filename, mode);
    27 }
    282
    293int load_image_db (FITS_DB *db) {

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

    r4864 r6237  
    11# include "relphot.h"
    22
    3 void lock_image_db (FITS_DB *db, char *filename) {
    4 
    5   /* lock the image catalog */
    6   check_permissions (filename);
    7 
    8   db[0].lockstate = LCK_XCLD;
    9   db[0].timeout   = 3600.0;
    10   fits_db_init (db);
    11 
    12   if (!fits_db_lock (db, filename)) {
    13     fprintf (stderr, "ERROR: can't lock image catalog\n");
    14     exit (1);
    15   }
    16 }
    17 
    18 void unlock_image_db (FITS_DB *db) {
    19 
    20   mode_t mode;
    21 
    22   fits_db_close (db);
    23 
    24   /* force permissions to 666 */
    25   mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
    26   chmod (db[0].filename, mode);
    27 }

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

    r4864 r6237  
    88  int       *Line;
    99  int        Nimage;
    10 
    11   if (db[0].dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db[0].filename);
    1210
    1311  /* read entire db table */

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

    r5448 r6237  
    44int main (int argc, char **argv) {
    55
    6   int i, Ncatalog;
     6  int i, status, Ncatalog;
    77  Catalog *catalog;
    88  GSCRegion fullregion, *region;
    … …  
    1313
    1414  set_db (&db);
    15   lock_image_db (&db, ImageCat);
     15  status = dvo_image_lock (&db, ImageCat, 60.0, (UPDATE ? LCK_XCLD : LCK_SOFT));
     16  if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
     17  if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
     18  if (!UPDATE) dvo_image_unlock (&db);
    1619
    1720  /* load regions and images based on seed region */
    … …  
    8689  setMcalFinal ();
    8790  dvo_image_update (&db, VERBOSE);
    88   unlock_image_db (&db);
     91  dvo_image_unlock (&db);
    8992
    9093  exit (0);
Note: See TracChangeset for help on using the changeset viewer.