Changeset 35588

Timestamp:

May 21, 2013, 5:56:03 AM (13 years ago)

Author:

eugene

Message:

add warnings / errors about modes for which db merge history is not implemented yet

Location:

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

Files:

• dvomerge.c (modified) (2 diffs)
• dvomergeFromList.c (modified) (1 diff)
• dvomergeUpdate_threaded.c (modified) (1 diff)

branches/eam_branches/ipp-20130419/Ohana/src/dvomerge/src/dvomerge.c

@@ -10 +10 @@
   if (argc == 6) {
     if (!strcasecmp (argv[2], "and")) {
+      if (VERIFY) {
+        fprintf (stderr, "WARNING / ERROR : dvomerge (input1) and (input2) into (output) : VERIFY mode not implemented\n");
+        exit (3);
+      }
       dvomergeCreate (argc, argv);
     } else {
+      if (VERIFY) {
+        fprintf (stderr, "WARNING / ERROR : dvomerge (input) into (output) from (list) : VERIFY mode not implemented\n");
+        exit (3);
+      }
       dvomergeFromList (argc, argv);
     }
@@ -26 +34 @@
 }
 
-/* we have two possible modes of operation:
+/* we have two major modes of operation:
 
-   Create   : dvomerge (in1) and (in2) to (out) -- create a new db from two input dbs
-   Update   : dvomerge (in) into (out)          -- merge a new db into an existing db
-   Continue : dvomerge (in) into (out) continue -- merge a new db into an existing db
+   Create    : dvomerge (in1) and (in2) to (out) -- create a new db from two input dbs
+   Update    : dvomerge (in) into (out)          -- merge a new db into an existing db
 
+   we also have varients on Update:
+   Continue  : dvomerge (in) into (out) continue -- merge only unmerged tables into the existing db
+   From List : dvomerge (in) into (out) from (list) -- merge only specified tables into the existing db
+
+   neither of the 2 above modes update the image table
 */

branches/eam_branches/ipp-20130419/Ohana/src/dvomerge/src/dvomergeFromList.c

@@ -108 +108 @@
     dmhObjectStats *inStats = dmhObjectStatsRead (inputfile);
 
+    // XXX : we are not checking for already-merged entries
+
     LoadCatalog (&incatalog, NULL, inputfile, "r", NsecfiltInput);
 

branches/eam_branches/ipp-20130419/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c

@@ -129 +129 @@
   output = argv[3];
 
+  fprintf (stderr, "WARNING / ERROR : multi-threaded dvomerge does not handle merge tracking yet\n");
+  exit (2);
+
   if (ALTERNATE_PHOTCODE_FILE) {
     fprintf (stderr, "cannot specify photcodes when merging into an existing catdir\n");