Changeset 31160 for trunk/Ohana/src/dvomerge

Timestamp:

Apr 4, 2011, 1:19:27 PM (15 years ago)

Author:

eugene

Message:

updates from eam branch

File:

• trunk/Ohana/src/dvomerge/src/dvoverify.c (modified) (6 diffs)

trunk/Ohana/src/dvomerge/src/dvoverify.c

@@ -13 +13 @@
 # define DEBUG 0
 
-int VERBOSE;
-int CHECKSORTED;
+int VERBOSE = FALSE;
 int NNotSorted = 0;
 
@@ -28 +27 @@
   // Catalog catalog;
 
-  VERBOSE = FALSE;
+  int CHECKSORTED;
+
   if ((N = get_argument (argc, argv, "-v"))) {
     VERBOSE = TRUE;
     remove_argument (N, &argc, argv);
   }
+  if ((N = get_argument (argc, argv, "-verbose"))) {
+    VERBOSE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
   if ((N = get_argument (argc, argv, "-s"))) {
     CHECKSORTED = TRUE;
     remove_argument (N, &argc, argv);
   }
-
+  if ((N = get_argument (argc, argv, "-sorted"))) {
+    CHECKSORTED = TRUE;
+    remove_argument (N, &argc, argv);
+  }
 
   // restrict to a portion of the sky
@@ -57 +64 @@
 
   if (argc != 2) {
-    fprintf (stderr, "USAGE: dvoverify (catdir) [-region Rmin Rmax Dmin Dmax] [-v -s]\n\n -v = verbose \n -s = checks if sorted, return error if not\n");
-    fprintf (stderr, "  catdir : database of interest\n");
+    fprintf (stderr, "USAGE: dvoverify (catdir) [-region Rmin Rmax Dmin Dmax] [-v] [-s]\n\n");
+    fprintf (stderr, "  -v : VERBOSE\n");
+    fprintf (stderr, "  -s : checks if sorted, return error if not\n");
+    fprintf (stderr, "  (catdir) : database of interest\n");
     exit (2);
   }
@@ -96 +105 @@
   for (i = 0; i < inlist[0].Nregions; i++) {
     if (!inlist[0].regions[i][0].table) continue;
-    if ((NNotSorted > 0) && CHECKSORTED) continue;
     if (i % 1000 == 0) fprintf (stderr, ".");
 
@@ -116 +124 @@
     if (!CheckCatalogIndexes(catdir, inlist[0].filename[i], inlist[0].regions[i])){
       Nbad ++;
+    }
+
+    // exit immediately if any file are unsorted and we require sorted tables
+    if (CHECKSORTED && NNotSorted) {
+      fprintf (stderr, "ERROR: files are not sorted\n");
+      exit (1);
     }
   }
@@ -123 +137 @@
     exit (1);
   }
-  if ((NNotSorted > 0) && CHECKSORTED) {
-    fprintf (stderr, "ERROR: files are not sorted\n");
-     exit (1);
-  }
 
   fprintf (stderr, "SUCCESS: no files are bad\n");
+  if (NNotSorted) {
+    fprintf (stderr, "NOTE: %d files are not sorted\n", NNotSorted);
+  }
   exit (0);
 }