Changeset 34356 for branches/eam_branches/ipp-20120805/Ohana/src/dvomerge/src/dvomergeImageIDs.c

Timestamp:

Aug 25, 2012, 11:45:32 AM (14 years ago)

Author:

eugene

Message:

adding dvomerge history code to dvomerge

File:

• branches/eam_branches/ipp-20120805/Ohana/src/dvomerge/src/dvomergeImageIDs.c (modified) (2 diffs)

branches/eam_branches/ipp-20120805/Ohana/src/dvomerge/src/dvomergeImageIDs.c

@@ -21 +21 @@
     return TRUE;
   }
+  // this operation reads the PHU header (inDB.header)
   if (!dvo_image_load (&inDB, VERBOSE, TRUE)) {
     Shutdown ("can't read input image catalog %s", inDB.filename);
   }
+
+  // read the header for the database ID?
+  char *indbID = dvomergeHistoryReadID (&inDB);
+  if (!indbID) { 
+    Shutdown ("this database is missing a DVO database ID; please generate one before merging\n"); 
+  } 
 
   /*** load output/Images.dat ***/
@@ -41 +48 @@
   }
 
+  dmhImage *history = dmhImageRead (&outDB);
+  if (!history) { 
+    Shutdown ("error reading history for output database\n"); 
+  }
+
   // convert database table to internal structure & add to output image db
   dvo_image_merge_dbs(IDmap, &outDB, &inDB);
   dvo_image_unlock (&inDB); // unlock input
+
+  // add the new image db to merge history
+  // (updates header as well as history structure
+  if (!dmhImageAdd (&outDB, history, indbID)) { 
+    Shutdown ("error reading history for output database\n"); 
+  }
+
+  // XXX I need to pass the history structure back out somehow...
 
   SetProtect (TRUE);