Changeset 40763

Timestamp:

May 30, 2019, 8:46:29 AM (7 years ago)

Author:

eugene

Message:

merge changes from trunk (dvomerge options to skip MISSING table)

Location:

tags/ipp-ps2-20190404/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge/include/dvomerge.h (modified) (1 diff)
• src/dvomerge/src/LoadCatalog.c (modified) (2 diffs)
• src/dvomerge/src/args.c (modified) (2 diffs)
• src/dvomerge/src/build_links.c (modified) (1 diff)
• src/dvomerge/src/dvomergeUpdate_catalogs.c (modified) (1 diff)

tags/ipp-ps2-20190404/Ohana/src/dvomerge/include/dvomerge.h

@@ -62 +62 @@
 
 int    SKIP_MEASURE;
+int    SKIP_MISSING;
 int    SKIP_LENSING;
 int    SKIP_LENSOBJ;

tags/ipp-ps2-20190404/Ohana/src/dvomerge/src/LoadCatalog.c

@@ -10 +10 @@
   // always load all of the data (if any exists)
 
-  catalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
+  catalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
 
   if (SKIP_MEASURE) {
@@ -16 +16 @@
   } else {
     catalog[0].catflags = catalog[0].catflags | DVO_LOAD_MEASURE;
+  }
+
+  if (SKIP_MISSING) {
+    catalog[0].catflags = catalog[0].catflags | DVO_SKIP_MISSING;
+  } else {
+    catalog[0].catflags = catalog[0].catflags | DVO_LOAD_MISSING;
   }
 

tags/ipp-ps2-20190404/Ohana/src/dvomerge/src/args.c

@@ -51 +51 @@
   if ((N = get_argument (*argc, argv, "-skip-measure"))) {
     SKIP_MEASURE = TRUE;
+    remove_argument (N, argc, argv);
+  }
+  SKIP_MISSING = FALSE;
+  if ((N = get_argument (*argc, argv, "-skip-missing"))) {
+    SKIP_MISSING = TRUE;
     remove_argument (N, argc, argv);
   }
@@ -344 +349 @@
     remove_argument (N, argc, argv);
   }
+  SKIP_MISSING = FALSE;
+  if ((N = get_argument (*argc, argv, "-skip-missing"))) {
+    SKIP_MISSING = TRUE;
+    remove_argument (N, argc, argv);
+  }
   SKIP_LENSING = FALSE;
   if ((N = get_argument (*argc, argv, "-skip-lensing"))) {

tags/ipp-ps2-20190404/Ohana/src/dvomerge/src/build_links.c

@@ -185 +185 @@
   off_t *next_missing;
 
+  if (!missing) return NULL;
+  if (SKIP_MISSING) return NULL;
+
   N = 0;
 

tags/ipp-ps2-20190404/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -336 +336 @@
 
     if (SKIP_MEASURE)               { strextend (&command, "-skip-measure"); }
+    if (SKIP_MISSING)               { strextend (&command, "-skip-missing"); }
     if (SKIP_LENSING)               { strextend (&command, "-skip-lensing"); }
     if (SKIP_LENSOBJ)               { strextend (&command, "-skip-lensobj"); }