Changeset 36946

Timestamp:

Jun 30, 2014, 9:40:40 PM (12 years ago)

Author:

eugene

Message:

handle lock / unlink for catalogs without all entries (eg, missing the lensing, lensobj tables)

File:

• branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_catalog.c (modified) (4 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_catalog.c

@@ -533 +533 @@
   }
 
+  // closes f but does not set back to NULL
   fclearlockfile (catalog[0].filename, catalog[0].f, catalog[0].lockmode, &dbstate);
 
@@ -944 +945 @@
     }
     if (catalog[0].lensing_catalog != NULL) {
-      if (!dvo_catalog_backup (catalog[0].lensing_catalog, FALSE)) {
-        return FALSE;
+      if (catalog[0].Nlensing_disk == 0) {
+        // need to relock (and re-open) file for close elsewhere
+        status = dvo_catalog_lock (catalog[0].lensing_catalog, lockmode);
+      } else {
+        if (!dvo_catalog_backup (catalog[0].lensing_catalog, FALSE)) {
+          return FALSE;
+        }
       }
     }
     if (catalog[0].lensobj_catalog != NULL) {
-      if (!dvo_catalog_backup (catalog[0].lensobj_catalog, FALSE)) {
-        return FALSE;
+      if (catalog[0].Nlensobj_disk == 0) {
+        // need to relock (and re-open) file for close elsewhere
+        status = dvo_catalog_lock (catalog[0].lensobj_catalog, lockmode);
+      } else {
+        if (!dvo_catalog_backup (catalog[0].lensobj_catalog, FALSE)) {
+          return FALSE;
+        }
       }
     }
@@ -974 +985 @@
   status = unlink (tmpfilename);
   if (status) {
-    fprintf (stderr, "failed to unlink catalog %s\n", catalog->filename);
+    fprintf (stderr, "failed to unlink catalog %s~\n", catalog->filename);
     return FALSE;
   }
@@ -994 +1005 @@
       }
     }
-    if (catalog[0].lensing_catalog != NULL) {
+    if ((catalog[0].lensing_catalog != NULL) && (catalog[0].Nlensing_disk > 0)) {
       if (!dvo_catalog_unlink_backup (catalog[0].lensing_catalog, FALSE)) {
         return FALSE;
       }
     }
-    if (catalog[0].lensobj_catalog != NULL) {
+    if ((catalog[0].lensobj_catalog != NULL) && (catalog[0].Nlensobj_disk > 0)) {
       if (!dvo_catalog_unlink_backup (catalog[0].lensobj_catalog, FALSE)) {
         return FALSE;