Changeset 35579

Timestamp:

May 10, 2013, 5:53:31 PM (13 years ago)

Author:

eugene

Message:

add test-case options -dup-images (allow duplicate image IDs) and -image-id-override (force a specific image ID)

Location:

trunk/Ohana/src/addstar

Files:

• include/addstar.h (modified) (1 diff)
• src/ImageIndex.c (modified) (1 diff)
• src/UpdateImageIDs.c (modified) (2 diffs)
• src/args.c (modified) (2 diffs)

trunk/Ohana/src/addstar/include/addstar.h

@@ -119 +119 @@
 int     ACCEPT_TIME;    // accept time stamp (or 0)
 int     NO_STARS;       // ignore the stars
+int     NO_DUPLICATE_IMAGES; // allow / skip duplicate images 
+int     IMAGE_ID_OVERRIDE; // allow / skip duplicate images 
 int     TEXTMODE;       // force input file to be loaded as RAW
 int     SUBPIX;         // apply a subpix correction

trunk/Ohana/src/addstar/src/ImageIndex.c

@@ -159 +159 @@
   if (!index) {
       fprintf (stderr, "image index file is not found, cannot check for image duplicates\n");
-      exit (2);
+      exit (1);
   }
 

trunk/Ohana/src/addstar/src/UpdateImageIDs.c

@@ -35 +35 @@
   }
 
+  // TEST IMAGE_ID OVER-RIDE:
+  if (IMAGE_ID_OVERRIDE) {
+    imageID = IMAGE_ID_OVERRIDE;
+  }
+
   // XXX should the first image ID be 1, not 0?
   if (imageID == 0) imageID = 1;
@@ -54 +59 @@
   // set and update the imageID sequence
   // the file holding the index is created above if this is an empty db
-  CheckDuplicateImageIDs (images, Nimages);
+  if (NO_DUPLICATE_IMAGES) {
+    CheckDuplicateImageIDs (images, Nimages);
+  }
 
   imageID += Nimages;

trunk/Ohana/src/addstar/src/args.c

@@ -308 +308 @@
   if ((N = get_argument (argc, argv, "-no-stars"))) {
     NO_STARS = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  /* skip the stars */
+  NO_DUPLICATE_IMAGES = TRUE;
+  if ((N = get_argument (argc, argv, "-dup-images"))) {
+    NO_DUPLICATE_IMAGES = FALSE;
+    remove_argument (N, &argc, argv);
+  }
+  /* skip the stars */
+  IMAGE_ID_OVERRIDE = 0;
+  if ((N = get_argument (argc, argv, "-image-id-override"))) {
+    remove_argument (N, &argc, argv);
+    IMAGE_ID_OVERRIDE = atoi(argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -438 +451 @@
   fprintf (stderr, "  -use-name                   : use the given name instead of the filename as the filename\n");
   fprintf (stderr, "  -no-stars                   : skip the stars\n");
+  fprintf (stderr, "  -dup-images                 : skip the test for duplicate image IDs (test only!)\n");
   fprintf (stderr, "  -force                      : force read of database with inconsistent info\n");
   fprintf (stderr, "  -threads (N)                : use N threads for resort option\n");