Changeset 29789 for branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/dvomerge.c

Timestamp:

Nov 17, 2010, 10:34:05 AM (16 years ago)

Author:

eugene

Message:

added dvomergeFromList option

File:

• branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/dvomerge.c (modified) (1 diff)

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

@@ -10 +10 @@
   // XXX require both inputs to be sorted?
 
-  if (argc == 6) dvomergeCreate (argc, argv);
+  if (argc == 6) {
+    if (!strcasecmp (argv[2], "and")) {
+      dvomergeCreate (argc, argv);
+    } else {
+      dvomergeFromList (argc, argv);
+    }
+  }
   if (argc == 4) dvomergeUpdate (argc, argv);
   if (argc == 5) dvomergeContinue (argc, argv);