Changeset 35547 for branches/eam_branches/ipp-20130419/Ohana/src/dvomerge

Timestamp:

May 9, 2013, 11:28:24 AM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130419/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge/src/dvomergeFromList.c (modified) (3 diffs)
• src/dvomerge/src/dvoverify_utils.c (modified) (2 diffs)

branches/eam_branches/ipp-20130419/Ohana/src/dvomerge/src/dvomergeFromList.c

@@ -103 +103 @@
     sprintf (outputfile, "%s/%s", output, list[i]);
 
+    OutputStatus *outstat = OutputStatusInit (1);
+    outstat[0].history = dmhObjectRead (outputfile);
+
+    dmhObjectStats *inStats = dmhObjectStatsRead (inputfile);
+
     LoadCatalog (&incatalog, NULL, inputfile, "r", NsecfiltInput);
 
@@ -138 +143 @@
     outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
 
+    dmhObjectAdd (outstat[0].history, &outcatalog.header, inStats);
+
     // if we receive a signal which would cause us to exit, wait until the full catalog is written
     SetProtect (TRUE);
@@ -148 +155 @@
     fprintf (stderr, "merged %s into %s\n", inputfile, outputfile);
 
+    dmhObjectStatsFree (inStats);
+    OutputStatusFree (outstat, 1);
+
     dvo_catalog_unlock (&outcatalog);
     dvo_catalog_free (&outcatalog);

branches/eam_branches/ipp-20130419/Ohana/src/dvomerge/src/dvoverify_utils.c

@@ -26 +26 @@
   if (!VerifyTableFile (filename)) {
     fprintf (stderr, "bad average table %s\n", filename);
+    isGood = FALSE;
+  }
+
+  if (!CheckCatalogIndexes(filename, NULL)){
+    fprintf (stderr, "bad indexes in %s\n", filename);
     isGood = FALSE;
   }
@@ -45 +50 @@
     isGood = FALSE;
   }
+
   return (isGood);
 }