Changeset 39329 for trunk/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

Timestamp:

Feb 4, 2016, 5:07:08 PM (10 years ago)

Author:

eugene

Message:

adding options to reset the starpar tables; option to skip images in the src db which are not in the tgt database

File:

• trunk/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c (modified) (3 diffs)

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

@@ -181 +181 @@
       LoadCatalog (&outcatalog, outlist[0].regions[j], outcatalog.filename, "w", NsecfiltOutput);
 
+      if (RESET_STARPAR) {
+        myAssert (MATCHED_TABLES, "must use -matched-tables to reset starpar");
+        ResetStarPar (&outcatalog);
+      }
+
       if (UPDATE_CATFORMAT) {
         outcatalog.catformat = dvo_catalog_catformat (UPDATE_CATFORMAT);
@@ -239 +244 @@
     dvo_catalog_free (&incatalog);
   }
+
+  dvo_report_image_IDs (IDmap);
+
   return TRUE;
 }
@@ -306 +314 @@
                UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, RADIUS);
 
-    if (VERBOSE)             { strextend (&command, "-v"); }
-    if (VERIFY)              { strextend (&command, "-verify"); }
-    if (VERIFY_CATALOG_ONLY) { strextend (&command, "-verify-catalogs"); }
-    if (REPLACE_BY_PHOTCODE) { strextend (&command, "-replace"); }
-    if (REPLACE_TYCHO)       { strextend (&command, "-replace-tycho"); }
-    if (PARALLEL_INPUT)      { strextend (&command, "-parallel-input"); }
-    if (FORCE_MERGE)         { strextend (&command, "-force-merge"); }
-    if (MATCHED_TABLES)      { strextend (&command, "-matched-tables"); }
-    if (MATCH_BY_EXTERN_ID)  { strextend (&command, "-match-by-extern-id"); }
-    if (UPDATE_CATFORMAT)    { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); }
-    if (UPDATE_CATCOMPRESS)  { strextend (&command, "-update-catcompress %s", UPDATE_CATCOMPRESS); }
-    if (CPTLIST_FILENAME)    { strextend (&command, "-restrict-cpt %s", CPTLIST_FILENAME); }
-    if (REPAIR_BY_OBJID)     { strextend (&command, "-repair-by-objid"); }
+    if (VERBOSE)                    { strextend (&command, "-v"); }
+    if (VERIFY)                     { strextend (&command, "-verify"); }
+    if (VERIFY_CATALOG_ONLY)        { strextend (&command, "-verify-catalogs"); }
+    if (REPLACE_BY_PHOTCODE)        { strextend (&command, "-replace"); }
+    if (REPLACE_TYCHO)              { strextend (&command, "-replace-tycho"); }
+    if (PARALLEL_INPUT)             { strextend (&command, "-parallel-input"); }
+    if (FORCE_MERGE)                { strextend (&command, "-force-merge"); }
+    if (MATCHED_TABLES)             { strextend (&command, "-matched-tables"); }
+    if (MATCH_BY_EXTERN_ID)         { strextend (&command, "-match-by-extern-id"); }
+    if (RESET_STARPAR)              { strextend (&command, "-reset-starpar"); }
+    if (ALLOW_MISSING_INPUT_IMAGES) { strextend (&command, "-allow-missing-input-images"); }
+    if (UPDATE_CATFORMAT)           { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); }
+    if (UPDATE_CATCOMPRESS)         { strextend (&command, "-update-catcompress %s", UPDATE_CATCOMPRESS); }
+    if (CPTLIST_FILENAME)           { strextend (&command, "-restrict-cpt %s", CPTLIST_FILENAME); }
+    if (REPAIR_BY_OBJID)            { strextend (&command, "-repair-by-objid"); }
 
     // add some config variables: