Changeset 33904 for branches/eam_branches/ipp-20120405/Ohana

Timestamp:

May 22, 2012, 4:33:04 PM (14 years ago)

Author:

eugene

Message:

new dvoverfiy mode for a single cpt set; close the catalog file after test read of header; move client_logger to own file; add some verbosity to reload_catalogs

Location:

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

Files:

• dvomergeUpdate_catalogs.c (modified) (1 diff)
• dvoverify.c (modified) (1 diff)

branches/eam_branches/ipp-20120405/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -92 +92 @@
       }
       
+      fclose (fout);
+
       // update header of output catalog
       long long last_size;

branches/eam_branches/ipp-20120405/Ohana/src/dvomerge/src/dvoverify.c

@@ -44 +44 @@
     CHECKSORTED = TRUE;
     remove_argument (N, &argc, argv);
+  }
+
+  if ((N = get_argument (argc, argv, "-cpt"))) {
+    remove_argument (N, &argc, argv);
+    char *filename = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+
+    int isBad = FALSE;
+
+    if (!VerifyTableFile (filename)) {
+      fprintf (stderr, "bad average table %s\n", filename);
+      isBad = TRUE;
+    }
+
+    // change last 't' to 's':
+    int Nlast;
+    Nlast = strlen(filename) - 1;
+    filename[Nlast] = 's';
+    if (!VerifyTableFile (filename)) {
+      fprintf (stderr, "bad secfilt table %s\n", filename);
+      isBad = TRUE;
+    }
+
+    // change last 't' to 's':
+    Nlast = strlen(filename) - 1;
+    filename[Nlast] = 'm';
+    if (!VerifyTableFile (filename)) {
+      fprintf (stderr, "bad measure table %s\n", filename);
+      isBad = TRUE;
+    }
+
+    if (isBad) exit (1);
+    exit (0);
   }