Changeset 37067 for branches/eam_branches/ipp-ops-20130712/Ohana/src/dvomerge/src/dvomergeUpdate.c

Timestamp:

Jul 17, 2014, 12:32:26 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge (modified) (1 prop)
• src/dvomerge/src/dvomergeUpdate.c (modified) (2 diffs)

branches/eam_branches/ipp-ops-20130712/Ohana/src/dvomerge/src/dvomergeUpdate.c

@@ -111 +111 @@
   SetPhotcodeTable(NULL);
 
-  dvomergeUpdate_catalogs (input, output, outsky, inlist, NsecfiltInput, NsecfiltOutput, &IDmap, secfiltMap);
+  int status = dvomergeUpdate_catalogs (input, output, outsky, inlist, NsecfiltInput, NsecfiltOutput, &IDmap, secfiltMap);
 
   // save the output sky table copy
@@ -123 +123 @@
   gettimeofday (&stop, NULL);
   dtime = DTIME (stop, start);
+
+  if (!status) {
+    fprintf (stderr, "ERROR: elapsed time %9.4f sec\n", dtime);
+    exit (3);
+  }
+
   fprintf (stderr, "SUCCESS: elapsed time %9.4f sec\n", dtime);
-
   exit (0);
 }