Changeset 37790

Timestamp:

Jan 9, 2015, 6:28:40 PM (12 years ago)

Author:

eugene

Message:

output should take on supplied format if no output catalog already exists, and format is specified

Location:

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge

Files:

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

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/include/dvomerge.h

@@ -41 +41 @@
 int    REPLACE_BY_PHOTCODE;
 int    FORCE_MERGE;
+char  *UPDATE_CATFORMAT;
 
 int    MATCHED_TABLES;

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/src/args.c

@@ -56 +56 @@
     FORCE_MERGE = TRUE;
     remove_argument (N, argc, argv);
+  }
+
+  UPDATE_CATFORMAT = NULL;
+  if ((N = get_argument (argc, argv, "-update-catformat"))) {
+    remove_argument (N, &argc, argv);
+    UPDATE_CATFORMAT = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
   }
 

branches/eam_branches/ipp-20140904/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -175 +175 @@
       LoadCatalog (&outcatalog, outlist[0].regions[j], outcatalog.filename, "w", NsecfiltOutput);
 
-      // if no catalog already exists, use the input catalog to define the format
+      // if no catalog already exists, use the input catalog to define the format or the specified format
       if (outcatalog.Naves_disk == 0) {
-        outcatalog.catformat = incatalog.catformat;
+        if (UPDATE_CATFORMAT) {
+          outcatalog.catformat = dvo_catalog_catformat (UPDATE_CATFORMAT);
+        } else {
+          outcatalog.catformat = incatalog.catformat;
+        }
       }