Changeset 40377 for trunk

Timestamp:

Mar 26, 2018, 1:03:28 PM (8 years ago)

Author:

eugene

Message:

add option to limit merged objects to matched objects

Location:

trunk/Ohana/src/dvomerge

Files:

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

trunk/Ohana/src/dvomerge/include/dvomerge.h

@@ -55 +55 @@
 int    MATCH_BY_EXTERN_ID;
 
+int    ONLY_MATCHES;
+
 int    MATCHED_TABLES;
 int    RESET_STARPAR;

trunk/Ohana/src/dvomerge/src/args.c

@@ -86 +86 @@
   }
 
-  /* extra error messages */
+  /* match images in the src and tgt database tables by their externID values (otherwise by time and photcode) */
   MATCH_BY_EXTERN_ID = FALSE;
   if ((N = get_argument (*argc, argv, "-match-by-extern-id"))) {
     MATCH_BY_EXTERN_ID = TRUE;
+    remove_argument (N, argc, argv);
+  }
+  /* add objects from input to output database only if they match an existing object */
+  ONLY_MATCHES = FALSE;
+  if ((N = get_argument (*argc, argv, "-only-matches"))) {
+    ONLY_MATCHES = TRUE;
     remove_argument (N, argc, argv);
   }
@@ -373 +379 @@
   }
 
-  /* extra error messages */
+  /* match images in the src and tgt database tables by their externID values (otherwise by time and photcode) */
   MATCH_BY_EXTERN_ID = FALSE;
   if ((N = get_argument (*argc, argv, "-match-by-extern-id"))) {
     MATCH_BY_EXTERN_ID = TRUE;
+    remove_argument (N, argc, argv);
+  }
+  /* add objects from input to output database only if they match an existing object */
+  ONLY_MATCHES = FALSE;
+  if ((N = get_argument (*argc, argv, "-only-matches"))) {
+    ONLY_MATCHES = TRUE;
     remove_argument (N, argc, argv);
   }

trunk/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -330 +330 @@
     if (MATCHED_TABLES)      { strextend (&command, "-matched-tables"); }
     if (MATCH_BY_EXTERN_ID)  { strextend (&command, "-match-by-extern-id"); }
+    if (ONLY_MATCHES)        { strextend (&command, "-only-matches"); }
     if (UPDATE_CATFORMAT)    { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); }
     if (UPDATE_CATCOMPRESS)  { strextend (&command, "-update-catcompress %s", UPDATE_CATCOMPRESS); }

trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -406 +406 @@
   /** incorporate unmatched image stars, if this star is in field of this catalog **/
   /* these new entries are all written out in UPDATE mode */ 
-  for (i = 0; i < Nstars; i++) {
+  for (i = 0; (i < Nstars) && !ONLY_MATCHES; i++) {
     off_t N = N1[i];