Changeset 39201

Timestamp:

Nov 30, 2015, 6:16:53 AM (11 years ago)

Author:

eugene

Message:

add option to check the images in the dvo db

Location:

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

Files:

• Makefile (modified) (1 diff)
• include/dvoutils.h (modified) (2 diffs)
• src/dvoutils.c (modified) (1 diff)
• src/dvoutils_args.c (modified) (2 diffs)
• src/dvoutils_check_images.c (added)

branches/eam_branches/ipp-20151113/Ohana/src/dvomerge/Makefile

@@ -172 +172 @@
 $(SRC)/SetSignals.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/LoadImages.$(ARCH).o \
 $(SRC)/dvoutils.$(ARCH).o \
 $(SRC)/dvoutils_args.$(ARCH).o \
 $(SRC)/dvoutils_uniq_images.$(ARCH).o \
+$(SRC)/dvoutils_check_images.$(ARCH).o \
 $(SRC)/dvoutils_load_image_index.$(ARCH).o
 

branches/eam_branches/ipp-20151113/Ohana/src/dvomerge/include/dvoutils.h

@@ -20 +20 @@
   DVOUTILS_NONE,
   DVOUTILS_UNIQ_IMAGES,
+  DVOUTILS_CHECK_IMAGES,
 } DVOUTILS_OP_TYPE;
 
@@ -32 +33 @@
 
 char *IMAGES_LIST;
+char *CATDIR;
+char *EXTERN_ID_LIST;
 
 int main (int argc, char **argv);
 int dvoutils_args (int *argc, char **argv);
 int dvoutils_uniq_images (char *filename);
+int dvoutils_check_images (void);
 
 ImageData *dvoutils_load_image_index (char *filename);

branches/eam_branches/ipp-20151113/Ohana/src/dvomerge/src/dvoutils.c

@@ -13 +13 @@
       exit (0);
 
+    case DVOUTILS_CHECK_IMAGES:
+      dvoutils_check_images();
+      exit (0);
+
     default:
       fprintf (stderr, "ERROR: unknown option\n");

branches/eam_branches/ipp-20151113/Ohana/src/dvomerge/src/dvoutils_args.c

@@ -22 +22 @@
     remove_argument (N, argc, argv);
   }
+  if ((N = get_argument (*argc, argv, "-check-images"))) {
+    DVOUTILS_OP = DVOUTILS_CHECK_IMAGES;
+    remove_argument (N, argc, argv);
+    CATDIR = strcreate (argv[N]);
+    remove_argument (N, argc, argv);
+    EXTERN_ID_LIST = strcreate (argv[N]);
+    remove_argument (N, argc, argv);
+  }
+
+  if (*argc != 1) {
+    fprintf (stderr, "USAGE: dvoutils -uniq-images (filename) [-v,-verbose]\n\n");
+    fprintf (stderr, "USAGE: dvoutils -check-images (catdir) (externIDs) [-v,-verbose]\n\n");
+    fprintf (stderr, "  -v : VERBOSE\n");
+    exit (2);
+  }
 
   if (DVOUTILS_OP == DVOUTILS_NONE) {
@@ -28 +43 @@
   }
 
-  if (*argc != 1) {
-    fprintf (stderr, "USAGE: dvoutils -uniq-images (filename) [-v,-verbose]\n\n");
-    fprintf (stderr, "  -v : VERBOSE\n");
-    exit (2);
-  }
-
   return TRUE;
 }