Index: /branches/eam_branches/ohana.20150429/src/addstar/include/addstar.h
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/include/addstar.h	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/addstar/include/addstar.h	(revision 38346)
@@ -84,6 +84,7 @@
 char   GSCFILE[256];
 char  *CATDIR;
-char   CATMODE[16];    /* raw, mef, split, mysql */
-char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
+char   CATMODE[16];     /* raw, mef, split, mysql */
+char   CATFORMAT[16];   /* internal, elixir, loneos, panstarrs */
+char   CATCOMPRESS[16]; /* GZIP_1, NONE */
 char   TWO_MASS_DIR_AS[256];
 char   TWO_MASS_DIR_DR2[256];
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/ConfigInit.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/ConfigInit.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/ConfigInit.c	(revision 38346)
@@ -134,4 +134,7 @@
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
+  if (!ScanConfig (config, "CATCOMPRESS",       "%s",  0, CATCOMPRESS)) {
+    strcpy (CATCOMPRESS, "NONE");
+  }
   if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) {
     SKY_DEPTH = SKY_DEPTH_HST;
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Image.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Image.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Image.c	(revision 38346)
@@ -92,4 +92,5 @@
     /*** update the image table ***/
     /* setup image table format and lock */
+    gfits_db_init (&db);
     db.mode   = dvo_catalog_catmode (CATMODE);
     db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateImageIDs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateImageIDs.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateImageIDs.c	(revision 38346)
@@ -9,4 +9,5 @@
   /*** update the image table ***/
   /* setup image table format and lock */
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/addstar.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/addstar.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/addstar.c	(revision 38346)
@@ -104,9 +104,10 @@
 
     // set the parameters which guide catalog open/load/create
-    catalog.filename  = skylist[0].filename[i];
-    catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
-    catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_LENSING;
-    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+    catalog.filename    = skylist[0].filename[i];
+    catalog.catmode     = dvo_catalog_catmode (CATMODE);         // set the default catmode from config data
+    catalog.catformat   = dvo_catalog_catformat (CATFORMAT);     // set the default catformat from config data
+    catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
+    catalog.catflags    = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_LENSING;
+    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();
 
     // XXX need to do something to enforce consistency.  we can change options.update
@@ -193,4 +194,5 @@
   /*** update the image table ***/
   /* setup image table format and lock */
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/addstar_create_ID.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/addstar_create_ID.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/addstar_create_ID.c	(revision 38346)
@@ -10,5 +10,5 @@
   /*** update the image table ***/
   /* setup image table format and lock */
-  // gfits_db_init (&db);
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/dumpskycells.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/dumpskycells.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/dumpskycells.c	(revision 38346)
@@ -46,4 +46,5 @@
   /*** open the image table ***/
   /* setup image table format and lock */
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/findskycell.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/findskycell.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/findskycell.c	(revision 38346)
@@ -173,4 +173,5 @@
   snprintf (imagefile, DVO_MAX_PATH, "%s/Images.dat", catdir);
 
+  gfits_db_init (&db);
   status = dvo_image_lock (&db, imagefile, 2.0, LCK_XCLD);
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
@@ -557,4 +558,5 @@
   snprintf (imagefile, DVO_MAX_PATH, "%s/Images.dat", catdir);
 
+  gfits_db_init (&db);
   status = dvo_image_lock (&db, imagefile, 2.0, LCK_XCLD);
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/loadsupercos.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/loadsupercos.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/loadsupercos.c	(revision 38346)
@@ -47,4 +47,5 @@
 
   // attempt to open the existing images table.  if it does not exist, we will save the loaded images
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/skycells.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/skycells.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/skycells.c	(revision 38346)
@@ -12,4 +12,5 @@
   /*** update the image table ***/
   /* setup image table format and lock */
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/checkastro/src/checkastro_images.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/checkastro/src/checkastro_images.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/checkastro/src/checkastro_images.c	(revision 38346)
@@ -11,4 +11,5 @@
   /* register database handle with shutdown procedure */
   set_db (&db);
+  gfits_db_init (&db);
 
   /* lock and load the image db table */
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delstar.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delstar.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delstar.c	(revision 38346)
@@ -12,4 +12,5 @@
   if (!SKIP_IMAGES) {
     set_db (&db);
+    gfits_db_init (&db);
     status = dvo_image_lock (&db, ImageCat, 60.0, LCK_XCLD); /* XCLD */
     if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoconvert.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoconvert.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoconvert.c	(revision 38346)
@@ -122,4 +122,5 @@
   /*** load output/Images.dat ***/
   sprintf (ImageCat, "%s/Images.dat", output);
+  gfits_db_init (&outDB);
   outDB.mode   = dvo_catalog_catmode (CATMODE);
   outDB.format = dvo_catalog_catformat (CATFORMAT);
@@ -135,4 +136,5 @@
   /*** load input/Images.dat ***/
   sprintf (ImageCat, "%s/Images.dat", input);
+  gfits_db_init (&inDB);
   // inDB.mode   = dvo_catalog_catmode (CATMODE);
   // inDB.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeCreate.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeCreate.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeCreate.c	(revision 38346)
@@ -204,4 +204,5 @@
     /*** load output/Images.dat ***/
     sprintf (ImageCat, "%s/Images.dat", output);
+    gfits_db_init (&outDB);
     outDB.mode   = dvo_catalog_catmode (CATMODE);
     outDB.format = dvo_catalog_catformat (CATFORMAT);
@@ -218,4 +219,5 @@
     /*** load input1/Images.dat ***/
     sprintf (ImageCat, "%s/Images.dat", input1);
+    gfits_db_init (&in1DB);
     in1DB.mode   = dvo_catalog_catmode (CATMODE);
     in1DB.format = dvo_catalog_catformat (CATFORMAT);
@@ -237,4 +239,5 @@
     /*** load input2/Images.dat ***/
     sprintf (ImageCat, "%s/Images.dat", input2);
+    gfits_db_init (&in2DB);
     in2DB.mode   = dvo_catalog_catmode (CATMODE);
     in2DB.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeImageIDs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeImageIDs.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeImageIDs.c	(revision 38346)
@@ -10,7 +10,8 @@
   /*** load input1/Images.dat ***/
   sprintf (ImageCat, "%s/Images.dat", input);
+  gfits_db_init (&inDB);
   inDB.mode   = dvo_catalog_catmode (CATMODE);
   inDB.format = dvo_catalog_catformat (CATFORMAT);
-  status       = dvo_image_lock (&inDB, ImageCat, 3600.0, LCK_SOFT);  // shorter timeout?
+  status      = dvo_image_lock (&inDB, ImageCat, 3600.0, LCK_SOFT);  // shorter timeout?
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", inDB.filename);
 
@@ -37,4 +38,5 @@
   /*** load output/Images.dat ***/
   sprintf (ImageCat, "%s/Images.dat", output);
+  gfits_db_init (&outDB);
   outDB.mode   = dvo_catalog_catmode (CATMODE);
   outDB.format = dvo_catalog_catformat (CATFORMAT);
@@ -93,7 +95,8 @@
   /*** load input1/Images.dat ***/
   sprintf (ImageCat, "%s/Images.dat", input);
+  gfits_db_init (&inDB);
   inDB.mode   = dvo_catalog_catmode (CATMODE);
   inDB.format = dvo_catalog_catformat (CATFORMAT);
-  status       = dvo_image_lock (&inDB, ImageCat, 5400.0, LCK_XCLD);  // shorter timeout?
+  status      = dvo_image_lock (&inDB, ImageCat, 5400.0, LCK_XCLD);  // shorter timeout?
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", inDB.filename);
 
@@ -115,4 +118,5 @@
   /*** load output/Images.dat ***/
   sprintf (ImageCat, "%s/Images.dat", output);
+  gfits_db_init (&outDB);
   outDB.mode   = dvo_catalog_catmode (CATMODE);
   outDB.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImagesByExternID.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImagesByExternID.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImagesByExternID.c	(revision 38346)
@@ -493,4 +493,5 @@
 
   /* setup image table format and lock */
+  gfits_db_init (&db);
   db.mode    = dvo_catalog_catmode ("SPLIT");
   db.format  = dvo_catalog_catformat ("PS1_V5");
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixImages.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixImages.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixImages.c	(revision 38346)
@@ -255,4 +255,5 @@
 
   /* setup image table format and lock */
+  gfits_db_init (oldDB);
   db.mode   = oldDB->mode;
   db.format = oldDB->format;
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoverify_utils.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoverify_utils.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoverify_utils.c	(revision 38346)
@@ -467,4 +467,5 @@
 
   // load the iage database table
+  gfits_db_init (&inDB);
   status = dvo_image_lock (&inDB, ImageCat, 3600.0, LCK_SOFT);  // shorter timeout?
   if (!status) {
Index: /branches/eam_branches/ohana.20150429/src/fakeastro/src/fakeastro_images.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/fakeastro/src/fakeastro_images.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/fakeastro/src/fakeastro_images.c	(revision 38346)
@@ -67,4 +67,5 @@
 
   /* setup image table format and lock */
+  gfits_db_init (db);
   db->mode    = dvo_catalog_catmode (CATMODE);
   db->format  = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/fakeastro/src/load_template_images.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/fakeastro/src/load_template_images.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/fakeastro/src/load_template_images.c	(revision 38346)
@@ -5,4 +5,5 @@
   FITS_DB db;
 
+  gfits_db_init (&db);
   db.mode    = dvo_catalog_catmode (CATMODE);
   db.format  = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/getstar/src/dvoImageExtract.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/getstar/src/dvoImageExtract.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/getstar/src/dvoImageExtract.c	(revision 38346)
@@ -14,4 +14,5 @@
   /*** update the image table ***/
   /* setup image table format and lock */
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/getstar/src/dvoImageOverlaps.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/getstar/src/dvoImageOverlaps.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/getstar/src/dvoImageOverlaps.c	(revision 38346)
@@ -17,4 +17,5 @@
   /*** update the image table ***/
   /* setup image table format and lock */
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/getstar/src/dvoImagesAtCoords.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/getstar/src/dvoImagesAtCoords.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/getstar/src/dvoImagesAtCoords.c	(revision 38346)
@@ -43,4 +43,5 @@
     /*** update the image table ***/
     /* setup image table format and lock */
+    gfits_db_init (&db);
     db.mode   = dvo_catalog_catmode (CATMODE);
     db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/imregister/imreg/imregclient.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/imreg/imregclient.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/imreg/imregclient.c	(revision 38346)
@@ -66,7 +66,7 @@
   if (NoReg) dump_data (image, Nentry);
 
+  gfits_db_init (&db);
   db.lockstate = LCK_HARD;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   if (!gfits_db_lock (&db, TempDB)) {
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/detregister.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/detregister.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/detregister.c	(revision 38346)
@@ -17,7 +17,7 @@
   SaveEntry (argv[1], &newdata, descriptor.imageID);
 
+  gfits_db_init (&db);
   db.lockstate = LCK_HARD;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   dBFile = set_dBFile ();
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/detsearch.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/detsearch.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/detsearch.c	(revision 38346)
@@ -17,7 +17,7 @@
   if (output.Criteria) PrintCriteria ();
 	
+  gfits_db_init (&db);
   db.lockstate = (output.Modify || output.Delete) ? LCK_HARD : LCK_SOFT;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   dBFile = set_dBFile ();
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/imphotsearch.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/imphotsearch.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/imphotsearch.c	(revision 38346)
@@ -14,7 +14,7 @@
   args (argc, argv);
  
+  gfits_db_init (&db);
   db.lockstate = (options.modify) ? LCK_HARD : LCK_SOFT;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   /* don't create a new image table if not available */
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/imregister.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/imregister.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/imregister.c	(revision 38346)
@@ -17,7 +17,7 @@
   if (NoReg) goto skip_reg;
 
+  gfits_db_init (&db);
   db.lockstate = LCK_HARD;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   if (!gfits_db_lock (&db, ImageDB)) {
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/imregtable.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/imregtable.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/imregtable.c	(revision 38346)
@@ -40,7 +40,7 @@
 
   /* load database table */
+  gfits_db_init (&db);
   db.lockstate = LCK_HARD;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   if (!gfits_db_lock (&db, ImageDB)) {
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/imsearch.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/imsearch.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/imsearch.c	(revision 38346)
@@ -12,7 +12,7 @@
   args (argc, argv);
 
+  gfits_db_init (&db);
   db.lockstate = (output.modify || output.delete) ? LCK_HARD : LCK_SOFT;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   if (!gfits_db_lock (&db, ImageDB)) {
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/imstatreg.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/imstatreg.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/imstatreg.c	(revision 38346)
@@ -40,7 +40,7 @@
   }
 
+  gfits_db_init (&image_db);
   image_db.lockstate = LCK_HARD;
   image_db.timeout   = 300.0;
-  gfits_db_init (&image_db);
 
   temp_db.lockstate = LCK_HARD;
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/photreg.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/photreg.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/photreg.c	(revision 38346)
@@ -12,7 +12,7 @@
   regargs (argc, argv, &newdata);
 
+  gfits_db_init (&db);
   db.lockstate = LCK_HARD;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   filename = PhotDB;
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/photsearch.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/photsearch.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/photsearch.c	(revision 38346)
@@ -15,7 +15,7 @@
   args (argc, argv);
 
+  gfits_db_init (&db);
   db.lockstate = (output.modify || output.delete) ? LCK_HARD : LCK_SOFT;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   if (!strcmp (output.db, "phot")) {
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/spregister.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/spregister.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/spregister.c	(revision 38346)
@@ -17,7 +17,7 @@
   if (NoReg) exit (0);
 
+  gfits_db_init (&db);
   db.lockstate = LCK_HARD;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   if (!gfits_db_lock (&db, SpectrumDB)) {
Index: /branches/eam_branches/ohana.20150429/src/imregister/src/spsearch.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/imregister/src/spsearch.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/imregister/src/spsearch.c	(revision 38346)
@@ -12,7 +12,7 @@
   args (argc, argv);
 
+  gfits_db_init (&db);
   db.lockstate = (output.modify || output.delete) ? LCK_HARD : LCK_SOFT;
   db.timeout   = 300.0;
-  gfits_db_init (&db);
 
   if (!gfits_db_lock (&db, SpectrumDB)) {
Index: /branches/eam_branches/ohana.20150429/src/libdvo/include/dvo.h
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libdvo/include/dvo.h	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/libdvo/include/dvo.h	(revision 38346)
@@ -10,9 +10,12 @@
 
 /* DVO table modes */
-typedef enum {DVO_MODE_UNDEF, DVO_MODE_RAW, DVO_MODE_MEF, DVO_MODE_SPLIT, DVO_MODE_MYSQL} DVOTableMode;
+typedef enum {DVO_MODE_UNDEF = 0, DVO_MODE_RAW, DVO_MODE_MEF, DVO_MODE_SPLIT, DVO_MODE_MYSQL} DVOCatMode;
+
+/* DVO table modes */
+typedef enum {DVO_COMPRESS_NONE = 0, DVO_COMPRESS_GZIP_1} DVOCatCompress; // 
 
 /* DVO table formats */
 typedef enum {
-  DVO_FORMAT_UNDEF, 
+  DVO_FORMAT_UNDEF = 0, 
   DVO_FORMAT_INTERNAL, 
   DVO_FORMAT_ELIXIR, 
@@ -30,27 +33,7 @@
   DVO_FORMAT_PS1_V4,
   DVO_FORMAT_PS1_V5,
-} DVOTableFormat;
-
-/* image data modes in RegImage */
-typedef enum {T_UNDEF = -1, T_NONE, T_OBJECT, T_DARK, T_BIAS, T_FLAT, T_MASK, T_FRINGE, T_SCATTER, T_MODES, T_FRINGEPTS, T_ANY, N_TYPE} ElixirDetrendTypes;
-typedef enum {M_UNDEF = -1, M_NONE, M_MEF, M_SPLIT, M_SINGLE, M_CUBE, M_SLICE, M_MODES, N_MODE} ElixirDetrendModes;
+} DVOCatFormat;
 
 typedef enum {DVO_CAT_OPEN_FAIL, DVO_CAT_OPEN_OK, DVO_CAT_OPEN_EMPTY} DVOCatalogOpenModes;
-
-// these are used as NAN for types of int values
-typedef enum {
-  NAN_S_CHAR  = 0x7f,
-  NAN_U_CHAR  = 0xff,   // was NO_ERR
-  NAN_S_SHORT = 0x7fff, // was NO_MAG
-  NAN_U_SHORT = 0xffff, 
-  NAN_S_INT   = 0x7fffffff,
-  NAN_U_INT   = (signed int) 0xffffffff,
-} DVO_INT_NAN;
-
-// max path length
-# define DVO_MAX_PATH 1024
-
-/* RegImage.flag values */
-# define IMREG_DIST  0x01 /* image distributed, only imregister-3.0 */
 
 /* catalog values to be loaded */
@@ -74,4 +57,24 @@
   SKIP_GALSHAPE = 0x8000,
 } DVOCatFlags;
+
+/* image data modes in RegImage */
+typedef enum {T_UNDEF = -1, T_NONE, T_OBJECT, T_DARK, T_BIAS, T_FLAT, T_MASK, T_FRINGE, T_SCATTER, T_MODES, T_FRINGEPTS, T_ANY, N_TYPE} ElixirDetrendTypes;
+typedef enum {M_UNDEF = -1, M_NONE, M_MEF, M_SPLIT, M_SINGLE, M_CUBE, M_SLICE, M_MODES, N_MODE} ElixirDetrendModes;
+
+// these are used as NAN for types of int values
+typedef enum {
+  NAN_S_CHAR  = 0x7f,
+  NAN_U_CHAR  = 0xff,   // was NO_ERR
+  NAN_S_SHORT = 0x7fff, // was NO_MAG
+  NAN_U_SHORT = 0xffff, 
+  NAN_S_INT   = 0x7fffffff,
+  NAN_U_INT   = (signed int) 0xffffffff,
+} DVO_INT_NAN;
+
+// max path length
+# define DVO_MAX_PATH 1024
+
+/* RegImage.flag values */
+# define IMREG_DIST  0x01 /* image distributed, only imregister-3.0 */
 
 /* photometry code types */
@@ -228,5 +231,5 @@
   char   lockstate;
   char   mode;          /* what data storage mode is used for disk file? */
-  char   format;        /* what data format is used for disk file? */
+  DVOCatFormat format;  /* what data format is used for disk file? */
   char   virtual;       /* is table in ftable or vtable? */
   char   nativeOrder;   /* is table in internal byte-order? */
@@ -786,10 +789,11 @@
   /* extra catalog information */
   char lockmode;
-  char catmode;				/* storage mode (raw, mef, split, mysql) */
-  char catformat;			/* storage format (elixir, panstarrs, etc) */
+  DVOCatMode     catmode;     /* storage mode (raw, mef, split, mysql) */
+  DVOCatFormat   catformat;			/* storage format (elixir, panstarrs, etc) */
+  DVOCatCompress catcompress;			// output compress mode
+  DVOCatFlags    catflags;			/* choices to be loaded */
+  
   int sorted;				/* is measure table average-sorted? (NOTE this is an int only because gfits_scan %t requires it) */
-  char compressOutput;
-  
-  DVOCatFlags catflags; /* choices to be loaded */
+
 
   /* pointers for data manipulation */
@@ -938,6 +942,8 @@
 int dvo_catalog_save_complete (Catalog *catalog, char VERBOSE);
 int dvo_catalog_update (Catalog *catalog, char VERBOSE);
-int dvo_catalog_catformat (char *catformat);
-int dvo_catalog_catmode (char *catmode);
+DVOCatFormat dvo_catalog_catformat (char *catformat);
+DVOCatMode dvo_catalog_catmode (char *catmode);
+DVOCatCompress dvo_catalog_catcompress (char *catcompress);
+char *dvo_catalog_compress_string (DVOCatCompress catcompress);
 void dvo_catalog_test (Catalog *catalog, int halt);
 
@@ -966,26 +972,26 @@
 int WriteRawSecFilt (FILE *f, SecFilt *secfilt, off_t Nsecfilt, char format);
 
-DVOTableFormat FtableGetFormat (FTable *ftable);
-
-Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary, char nativeBytes);
-Measure *FtableToMeasure (FTable *ftable, Average *average, off_t *Nmeasure, char *format);
-SecFilt *FtableToSecFilt (FTable *ftable, off_t *Nsecfilt, char *format);
-Lensing *FtableToLensing (FTable *ftable, off_t *Nlensing, char *format);
-Lensobj *FtableToLensobj (FTable *ftable, off_t *Nlensobj, char *format);
-StarPar *FtableToStarPar (FTable *ftable, off_t *Nstarpar, char *format);
-GalShape *FtableToGalShape (FTable *ftable, off_t *Ngalshape, char *format);
-
-int      FtableToImage   (FTable *ftable, Header *theader, char *format);
-
-int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary, int swapFromNative);
-int MeasureToFtable (FTable *ftable, Average *average, Measure *measure, off_t Nmeasure, char format);
-int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, off_t Nsecfilt, char format);
-int LensingToFtable (FTable *ftable, Lensing *lensing, off_t Nlensing, char format);
-int LensobjToFtable (FTable *ftable, Lensobj *lensobj, off_t Nlensobj, char format);
-int StarParToFtable (FTable *ftable, StarPar *starpar, off_t Nstarpar, char format);
-int GalShapeToFtable (FTable *ftable, GalShape *galshape, off_t Ngalshape, char format);
-
-int ImageToFtable (FTable *ftable, Header *theader, char format);
-int ImageToVtable (VTable *vtable, Header *theader, char format);
+DVOCatFormat FtableGetFormat (FTable *ftable);
+
+Measure *FtableToMeasure   (FTable *ftable, Average *average, off_t *Nmeasure, DVOCatFormat *format);
+Average *FtableToAverage   (FTable *ftable, off_t *Naverage,  DVOCatFormat *format, SecFilt **primary, char nativeBytes);
+SecFilt *FtableToSecFilt   (FTable *ftable, off_t *Nsecfilt,  DVOCatFormat *format);
+Lensing *FtableToLensing   (FTable *ftable, off_t *Nlensing,  DVOCatFormat *format);
+Lensobj *FtableToLensobj   (FTable *ftable, off_t *Nlensobj,  DVOCatFormat *format);
+StarPar *FtableToStarPar   (FTable *ftable, off_t *Nstarpar,  DVOCatFormat *format);
+GalShape *FtableToGalShape (FTable *ftable, off_t *Ngalshape, DVOCatFormat *format);
+
+int      FtableToImage   (FTable *ftable, Header *theader, DVOCatFormat *format);
+
+int MeasureToFtable  (FTable *ftable, Average  *average,  Measure *measure, off_t Nmeasure, DVOCatFormat format);
+int AverageToFtable  (FTable *ftable, Average  *average,  off_t Naverage,  DVOCatFormat format, SecFilt *primary, int swapFromNative);
+int SecFiltToFtable  (FTable *ftable, SecFilt  *secfilt,  off_t Nsecfilt,  DVOCatFormat format);
+int LensingToFtable  (FTable *ftable, Lensing  *lensing,  off_t Nlensing,  DVOCatFormat format);
+int LensobjToFtable  (FTable *ftable, Lensobj  *lensobj,  off_t Nlensobj,  DVOCatFormat format);
+int StarParToFtable  (FTable *ftable, StarPar  *starpar,  off_t Nstarpar,  DVOCatFormat format);
+int GalShapeToFtable (FTable *ftable, GalShape *galshape, off_t Ngalshape, DVOCatFormat format);
+
+int ImageToFtable (FTable *ftable, Header *theader, DVOCatFormat format);
+int ImageToVtable (VTable *vtable, Header *theader, DVOCatFormat format);
 
 # include "loneos_defs.h"
Index: /branches/eam_branches/ohana.20150429/src/libdvo/src/LoadPhotcodesFITS.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libdvo/src/LoadPhotcodesFITS.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/libdvo/src/LoadPhotcodesFITS.c	(revision 38346)
@@ -15,7 +15,7 @@
 
   /* XXX choose more sensible lock timeouts! */
+  gfits_db_init (&db);
   db.timeout   = 60.0;
   db.lockstate = LCK_SOFT;
-  gfits_db_init (&db);
 
   /* does this mean the db is empty, non-existent, or has access errors? */
Index: /branches/eam_branches/ohana.20150429/src/libdvo/src/SavePhotcodesFITS.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libdvo/src/SavePhotcodesFITS.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/libdvo/src/SavePhotcodesFITS.c	(revision 38346)
@@ -17,7 +17,7 @@
 
   /* XXX choose more sensible lock timeouts! */
+  gfits_db_init (&db);
   db.lockstate = LCK_XCLD;
   db.timeout   = 10.0;
-  gfits_db_init (&db);
 
   /* does this mean the db is empty, non-existent, or has access errors? */
Index: /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog.c	(revision 38346)
@@ -42,5 +42,5 @@
 }
 
-int dvo_catalog_catformat (char *catformat) {
+DVOCatFormat dvo_catalog_catformat (char *catformat) {
   
   /* set the specified CATFORMAT */
@@ -62,5 +62,5 @@
 }
 
-int dvo_catalog_catmode (char *catmode) {
+DVOCatMode dvo_catalog_catmode (char *catmode) {
 
   /* set the specified CATMODE */
@@ -69,4 +69,29 @@
   if (!strcasecmp (catmode, "SPLIT")) return (DVO_MODE_SPLIT);
   return (DVO_MODE_UNDEF);
+}
+
+DVOCatCompress dvo_catalog_catcompress (char *catcompress) {
+
+  /* set the specified CATMODE */
+  if (!strcasecmp (catcompress, "NONE"))   return (DVO_COMPRESS_NONE);
+  if (!strcasecmp (catcompress, "GZIP_1")) return (DVO_COMPRESS_GZIP_1);
+  return (DVO_COMPRESS_NONE);
+}
+
+// we can return a static string here unless we run multiple outputs threads at once
+static char compress_string[16];
+char *dvo_catalog_compress_string (DVOCatCompress catcompress) {
+
+  switch (catcompress) {
+    case DVO_COMPRESS_NONE:
+      strcpy (compress_string, "NONE");
+      break;
+      case DVO_COMPRESS_GZIP_1:
+      strcpy (compress_string, "GZIP_1");
+      break;
+    default:
+      myAbort ("error in compress option");
+  }
+  return compress_string;
 }
 
@@ -498,9 +523,10 @@
     catalog[0].filename = NULL;
 
-    catalog[0].lockmode = 0;
-    catalog[0].catmode  = 0;
-    catalog[0].catformat = 0;
-    catalog[0].catflags = 0;
-    catalog[0].Nsecfilt = 0;
+    catalog[0].lockmode    = 0;
+    catalog[0].catmode     = DVO_MODE_UNDEF;
+    catalog[0].catformat   = DVO_FORMAT_UNDEF;
+    catalog[0].catcompress = DVO_COMPRESS_NONE;
+    catalog[0].catflags    = LOAD_NONE;
+    catalog[0].Nsecfilt    = 0;
   }
 
Index: /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog_split.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog_split.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog_split.c	(revision 38346)
@@ -154,12 +154,13 @@
   FTable cmptable;
   Header cmpheader;
-  cmptable.header = &cmpheader;
   gfits_init_header (&cmpheader);
   gfits_init_table (&cmptable);
+  cmptable.header = &cmpheader;
   
   int fullWrite = (start == 0) && (Nrows == Ntotal);
 
-  if (fullWrite && catalog->compressOutput) {
-    if (!gfits_compress_table (ftable, &cmptable, 10, "GZIP_1")) {
+  if (fullWrite && catalog->catcompress) {
+    char *compressMode = dvo_catalog_compress_string (catalog->catcompress);
+    if (!gfits_compress_table (ftable, &cmptable, 10, compressMode)) {
       fprintf (stderr, "compression failure\n");
       return (FALSE);
@@ -355,4 +356,5 @@
       outtable = &rawtable;
       nativeOrder = TRUE;
+      catalog->catcompress = DVO_COMPRESS_GZIP_1; // if any table is compressed, set all to a compress state?
     }
     // NOTE: fread_ftable returns an unswapped table; uncompress swaps the bytes into native order
@@ -1004,5 +1006,5 @@
     int swapFromNative = TRUE;
     int fullWrite = (start == 0) && (Nrows == Naves_disk_new);
-    if (fullWrite && catalog->compressOutput) {
+    if (fullWrite && catalog->catcompress) {
       swapFromNative = FALSE;
     }
Index: /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_convert.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_convert.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_convert.c	(revision 38346)
@@ -11,7 +11,7 @@
     constructions below **/
 
-DVOTableFormat FtableGetFormat (FTable *ftable) {
-
-  DVOTableFormat format;
+DVOCatFormat FtableGetFormat (FTable *ftable) {
+
+  DVOCatFormat format;
   char extname[80];
 
@@ -52,5 +52,5 @@
 /*** Average / FTable conversion functions ***/
 
-Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary, char nativeBytes) {
+Average *FtableToAverage (FTable *ftable, off_t *Naverage, DVOCatFormat *format, SecFilt **primary, char nativeBytes) {
 
   Average *average;
@@ -139,5 +139,5 @@
 }
 
-int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary, int swapFromNative) {
+int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, DVOCatFormat format, SecFilt *primary, int swapFromNative) {
   
 # define FORMAT_CASE(FORMAT, TYPE)		\
@@ -180,5 +180,5 @@
 
 // FtableToMeasure needs the Average since old formats stored measure.dR,dD only
-Measure *FtableToMeasure (FTable *ftable, Average *average, off_t *Nmeasure, char *format) {
+Measure *FtableToMeasure (FTable *ftable, Average *average, off_t *Nmeasure, DVOCatFormat *format) {
 
   Measure *measure;
@@ -269,5 +269,5 @@
 
 // MeasureToFtable needs the Average since old formats stored measure.dR,dD only
-int MeasureToFtable (FTable *ftable, Average *average, Measure *measure, off_t Nmeasure, char format) {
+int MeasureToFtable (FTable *ftable, Average *average, Measure *measure, off_t Nmeasure, DVOCatFormat format) {
 
 # define FORMAT_CASE(FORMAT, TYPE, ABS_COORDS)		\
@@ -310,5 +310,5 @@
 /*** SecFilt / FTable conversion functions ***/
 
-SecFilt *FtableToSecFilt (FTable *ftable, off_t *Nsecfilt, char *format) {
+SecFilt *FtableToSecFilt (FTable *ftable, off_t *Nsecfilt, DVOCatFormat *format) {
 
   SecFilt *secfilt;
@@ -380,5 +380,5 @@
 }
 
-int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, off_t Nsecfilt, char format) {
+int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, off_t Nsecfilt, DVOCatFormat format) {
 
 # define FORMAT_CASE(FORMAT, TYPE) \
@@ -420,5 +420,5 @@
 /*** Lensing / FTable conversion functions ***/
 
-Lensing *FtableToLensing (FTable *ftable, off_t *Nlensing, char *format) {
+Lensing *FtableToLensing (FTable *ftable, off_t *Nlensing, DVOCatFormat *format) {
 
   Lensing *lensing;
@@ -520,5 +520,5 @@
 
 // LensingToFtable needs the Average since old formats stored lensing.dR,dD only
-int LensingToFtable (FTable *ftable, Lensing *lensing, off_t Nlensing, char format) {
+int LensingToFtable (FTable *ftable, Lensing *lensing, off_t Nlensing, DVOCatFormat format) {
 
 # define FORMAT_CASE(FORMAT, TYPE)		\
@@ -559,5 +559,5 @@
 /*** Lensobj / FTable conversion functions ***/
 
-Lensobj *FtableToLensobj (FTable *ftable, off_t *Nlensobj, char *format) {
+Lensobj *FtableToLensobj (FTable *ftable, off_t *Nlensobj, DVOCatFormat *format) {
 
   Lensobj *lensobj;
@@ -635,5 +635,5 @@
 
 // LensobjToFtable needs the Average since old formats stored lensobj.dR,dD only
-int LensobjToFtable (FTable *ftable, Lensobj *lensobj, off_t Nlensobj, char format) {
+int LensobjToFtable (FTable *ftable, Lensobj *lensobj, off_t Nlensobj, DVOCatFormat format) {
 
 # define FORMAT_CASE(FORMAT, TYPE)		\
@@ -674,5 +674,5 @@
 /*** StarPar / FTable conversion functions ***/
 
-StarPar *FtableToStarPar (FTable *ftable, off_t *Nstarpar, char *format) {
+StarPar *FtableToStarPar (FTable *ftable, off_t *Nstarpar, DVOCatFormat *format) {
 
   StarPar *starpar;
@@ -738,5 +738,5 @@
 
 // StarParToFtable needs the Average since old formats stored starpar.dR,dD only
-int StarParToFtable (FTable *ftable, StarPar *starpar, off_t Nstarpar, char format) {
+int StarParToFtable (FTable *ftable, StarPar *starpar, off_t Nstarpar, DVOCatFormat format) {
 
 # define FORMAT_CASE(FORMAT, TYPE)		\
@@ -778,5 +778,5 @@
 /*** GalShape / FTable conversion functions ***/
 
-GalShape *FtableToGalShape (FTable *ftable, off_t *Ngalshape, char *format) {
+GalShape *FtableToGalShape (FTable *ftable, off_t *Ngalshape, DVOCatFormat *format) {
 
   GalShape *galshape;
@@ -842,5 +842,5 @@
 
 // GalShapeToFtable needs the Average since old formats stored galshape.dR,dD only
-int GalShapeToFtable (FTable *ftable, GalShape *galshape, off_t Ngalshape, char format) {
+int GalShapeToFtable (FTable *ftable, GalShape *galshape, off_t Ngalshape, DVOCatFormat format) {
 
 # define FORMAT_CASE(FORMAT, TYPE)		\
@@ -883,5 +883,5 @@
 // I have loaded the disk db table and now I want to convert to the internal format
 // (Image structure), but I onyl 
-int FtableToImage (FTable *ftable, Header *theader, char *format) {
+int FtableToImage (FTable *ftable, Header *theader, DVOCatFormat *format) {
 
   off_t Nimage;
@@ -952,5 +952,5 @@
 }
 
-int ImageToFtable (FTable *ftable, Header *theader, char format) {
+int ImageToFtable (FTable *ftable, Header *theader, DVOCatFormat format) {
 
   off_t Nimage;
@@ -992,5 +992,5 @@
 }
 
-int ImageToVtable (VTable *vtable, Header *theader, char format) {
+int ImageToVtable (VTable *vtable, Header *theader, DVOCatFormat format) {
 
   off_t i, Nrow, Nimage;
Index: /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_image.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_image.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_image.c	(revision 38346)
@@ -19,5 +19,4 @@
   db[0].lockstate = lockstate;
   db[0].timeout   = timeout;
-  gfits_db_init (db);
 
   if (!gfits_db_lock (db, filename)) {
Index: /branches/eam_branches/ohana.20150429/src/markstar/src/markstar.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/markstar/src/markstar.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/markstar/src/markstar.c	(revision 38346)
@@ -37,4 +37,5 @@
 
   set_db (&db);
+  gfits_db_init (&db);
   dvo_image_lock (&db, ImageCat, 3600.0, LCK_XCLD);
 
Index: /branches/eam_branches/ohana.20150429/src/photdbc/src/Shutdown_dvodist.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/photdbc/src/Shutdown_dvodist.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/photdbc/src/Shutdown_dvodist.c	(revision 38346)
@@ -11,4 +11,5 @@
 
   // lock the image db table 
+  gfits_db_init (&db);
   int status = dvo_image_lock (&db, ImageCat, 60.0, LCK_XCLD);
   if (!status) {
Index: /branches/eam_branches/ohana.20150429/src/photdbc/src/copy_images.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/photdbc/src/copy_images.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/photdbc/src/copy_images.c	(revision 38346)
@@ -19,4 +19,5 @@
   if (status == -1) Shutdown ("ERROR: CATDIR %s does not exist, no data in database", path);
 
+  gfits_db_init (&in);
   status = dvo_image_lock (&in, ImageCat, 60.0, LCK_SOFT);
   if (!status) {
@@ -38,4 +39,5 @@
 
   // lock the output catalog
+  gfits_db_init (&out);
   status = dvo_image_lock (&out, ImageOut, 60.0, LCK_XCLD);
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", ImageOut);
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/ImageTable.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/ImageTable.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/ImageTable.c	(revision 38346)
@@ -7,4 +7,5 @@
   FITS_DB db;
 
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
@@ -42,4 +43,5 @@
 
   // setup image table format and lock 
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_client.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_client.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_client.c	(revision 38346)
@@ -69,4 +69,5 @@
       
       set_db (&db);
+      gfits_db_init (&db);
 
       /* lock and load the image db table */
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_images.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_images.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_images.c	(revision 38346)
@@ -11,4 +11,5 @@
   /* register database handle with shutdown procedure */
   set_db (&db);
+  gfits_db_init (&db);
 
   /* lock and load the image db table */
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_parallel_regions.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_parallel_regions.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_parallel_regions.c	(revision 38346)
@@ -17,4 +17,5 @@
   // register database handle with shutdown procedure 
   set_db (&db);
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/relphot/src/ImageTable.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relphot/src/ImageTable.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/relphot/src/ImageTable.c	(revision 38346)
@@ -7,4 +7,5 @@
   FITS_DB db;
 
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
@@ -45,6 +46,8 @@
 
   // setup image table format and lock 
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
+
   status    = dvo_image_lock (&db, filename, 60.0, LCK_XCLD);  // shorter timeout?
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
Index: /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_images.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_images.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_images.c	(revision 38346)
@@ -18,4 +18,5 @@
   /* register database handle with shutdown procedure */
   set_db (&db);
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_parallel_regions.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_parallel_regions.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_parallel_regions.c	(revision 38346)
@@ -23,4 +23,5 @@
   // register database handle with shutdown procedure
   set_db (&db);
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/fiximids.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/fiximids.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/fiximids.c	(revision 38346)
@@ -11,4 +11,5 @@
 
   set_db (&db);
+  gfits_db_init (&db);
   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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/fixstkids.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/fixstkids.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/fixstkids.c	(revision 38346)
@@ -11,4 +11,5 @@
 
   set_db (&db);
+  gfits_db_init (&db);
   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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/setfwhm.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/setfwhm.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/setfwhm.c	(revision 38346)
@@ -13,4 +13,5 @@
 
   set_db (&db);
+  gfits_db_init (&db);
   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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/setphot.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/setphot.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/setphot.c	(revision 38346)
@@ -14,4 +14,5 @@
 
   set_db (&db);
+  gfits_db_init (&db);
   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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/setposangle.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/setposangle.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/setposangle.c	(revision 38346)
@@ -11,4 +11,5 @@
 
   set_db (&db);
+  gfits_db_init (&db);
   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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/uniphot.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/uniphot.c	(revision 38345)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/uniphot.c	(revision 38346)
@@ -19,4 +19,5 @@
 
   set_db (&db);
+  gfits_db_init (&db);
   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);