Changeset 38755

Timestamp:

Sep 18, 2015, 6:44:27 AM (11 years ago)

Author:

eugene

Message:

bugfixes : load photcodes and open files r/w

File:

• branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvorepairDeleteImagesByExternID.c (modified) (4 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvorepairDeleteImagesByExternID.c

@@ -30 +30 @@
   Image *image;
   char *imageFilename = NULL;
+  char filename[DVO_MAX_PATH];
 
   N = get_argument (argc, argv, "-delete-images-by-extern-id");
@@ -50 +51 @@
   char *catdir = argv[1];
   char *delList = argv[2];
+
+  sprintf (filename, "%s/Photcodes.dat", catdir);
+  if (!LoadPhotcodes (filename, NULL, FALSE)) {
+    fprintf (stderr, "error reading photcodes from %s\n", catdir);
+    exit (1);
+  }     
 
   // load the image data
@@ -219 +226 @@
       if (!inlist[0].regions[i][0].table) continue;
 
-      char filename[DVO_MAX_PATH];
       snprintf (filename, DVO_MAX_PATH, "%s/%s.cpt", catdir, inlist[0].regions[i][0].name);
 
@@ -230 +236 @@
       catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
       
-      if (!dvo_catalog_open (&catalog, inlist[0].regions[i], VERBOSE, "r")) {
+      if (!dvo_catalog_open (&catalog, inlist[0].regions[i], VERBOSE, "w")) {
         fprintf (stderr, "ERROR: failure reading catalog %s\n", catalog.filename);
         exit (1);