Changeset 28864

Timestamp:

Aug 6, 2010, 11:23:25 PM (16 years ago)

Author:

eugene

Message:

db without image table can still be merged

Location:

branches/eam_branches/ipp-20100621/Ohana/src/dvomerge/src

Files:

• dvo_image_merge_dbs.c (modified) (1 diff)
• dvomergeUpdate.c (modified) (1 diff)

branches/eam_branches/ipp-20100621/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -65 +65 @@
   off_t Nlo, Nhi, N;
 
+  if (!IDmap->Nmap) return 0;
+
   // find the a close entry below desired ID
   Nlo = 0; Nhi = IDmap->Nmap;

branches/eam_branches/ipp-20100621/Ohana/src/dvomerge/src/dvomergeUpdate.c

@@ -131 +131 @@
   // load the image table 
   if (inDB.dbstate == LCK_EMPTY) {
-    Shutdown ("can't find input image catalog %s", inDB.filename);
+    // Shutdown ("can't find input image catalog %s", inDB.filename);
+    IDmap->Nmap = 0;
+    return TRUE;
   }
   if (!dvo_image_load (&inDB, VERBOSE, TRUE)) {