Changeset 35243

Timestamp:

Mar 6, 2013, 11:25:12 AM (13 years ago)

Author:

eugene

Message:

skip repair if no duplicate images are found

Location:

trunk/Ohana/src/delstar

Files:

• include/delstar.h (modified) (1 diff)
• src/delete_duplicate_images.c (modified) (5 diffs)

trunk/Ohana/src/delstar/include/delstar.h

@@ -120 +120 @@
 int delete_duplicate_image_measures_catalog (Catalog *catalog, IndexArray *imageID);
 
-IndexArray *find_duplicates (Image *image, off_t Nimage);
+IndexArray *find_duplicates (Image *image, off_t Nimage, off_t *Nduplicates);
 IndexArray *make_index_array (Image *image, off_t Nimage, int mode);
 

trunk/Ohana/src/delstar/src/delete_duplicate_images.c

@@ -17 +17 @@
   }
 
-  IndexArray *imageID = find_duplicates (image, Nimage);
+  off_t Nduplicates = 0;
+  IndexArray *imageID = find_duplicates (image, Nimage, &Nduplicates);
+
+  if (Nduplicates == 0) {
+    fprintf (stderr, "no duplicate images in this database, exiting\n");
+    exit (0);
+  }
+
+  fprintf (stderr, "deleting measures for "OFF_T_FMT" duplicate images in this database\n", Nduplicates);
 
   if (!IMAGE_ONLY) {
@@ -397 +405 @@
 }
 
-IndexArray *find_duplicates (Image *image, off_t Nimage) {
+IndexArray *find_duplicates (Image *image, off_t Nimage, off_t *Nduplicates) {
 
   off_t i, *Ndelete;
@@ -432 +440 @@
 
   IndexArray *imageID = make_index_array (image, Nimage, IMAGE_ID);
+
+  off_t Ndup = 0;
 
   // set imageID->value to TRUE for images we want to delete
@@ -447 +457 @@
     imageID->value[Ni] = TRUE;
     Ndelete[Nx] ++;
+
+    Ndup ++;
 
     // mark the parentID for deletion as well..
@@ -469 +481 @@
   free (extID);
 
+  *Nduplicates = Ndup;
+
   return imageID;;
 }