Changeset 35597

Timestamp:

May 24, 2013, 5:38:43 PM (13 years ago)

Author:

eugene

Message:

added -images-only option to dvomerge

Location:

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

Files:

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

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/args.c

@@ -21 +21 @@
   if ((N = get_argument (*argc, argv, "-check-only"))) {
     VERIFY = TRUE;
+    remove_argument (N, argc, argv);
+  }
+
+  /* extra error messages */
+  IMAGES_ONLY = FALSE;
+  if ((N = get_argument (*argc, argv, "-images-only"))) {
+    IMAGES_ONLY = TRUE;
     remove_argument (N, argc, argv);
   }
@@ -102 +109 @@
   PARALLEL_MANUAL = FALSE;
   PARALLEL_SERIAL = FALSE;
+  IMAGES_ONLY = FALSE;
 
   HOST_ID = 0;

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

@@ -14 +14 @@
         exit (3);
       }
+      if (IMAGES_ONLY) {
+        fprintf (stderr, "ERROR : dvomerge (input1) and (input2) into (output) : not compatible with '-images-only'\n");
+        exit (5);
+      }
       dvomergeCreate (argc, argv);
     } else {
@@ -19 +23 @@
         fprintf (stderr, "WARNING / ERROR : dvomerge (input) into (output) from (list) : VERIFY mode not implemented\n");
         exit (3);
+      }
+      if (IMAGES_ONLY) {
+        fprintf (stderr, "ERROR : dvomerge (input) input (output) from (list) : not compatible with '-images-only'\n");
+        exit (5);
       }
       dvomergeFromList (argc, argv);

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

@@ -22 +22 @@
     if (strcasecmp (argv[4], "continue")) dvomerge_usage();
     CONTINUE = TRUE;
+    if (IMAGES_ONLY) {
+      fprintf (stderr, "-images-only is not compatible with the 'continue' option\n");
+      exit (5);
+    }
   }
   if (VERIFY) CONTINUE = TRUE;

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

@@ -124 +124 @@
     if (strcasecmp (argv[4], "continue")) dvomerge_usage();
     CONTINUE = TRUE;
+    if (IMAGES_ONLY) {
+      fprintf (stderr, "-images-only is not compatible with the 'continue' option\n");
+      exit (5);
+    }
   }
 
@@ -183 +187 @@
   } else {
     dvomergeImagesUpdate (&IDmap, input, output);
+    if (IMAGES_ONLY) exit (0);
   }