Changeset 37526

Timestamp:

Oct 22, 2014, 12:49:08 PM (12 years ago)

Author:

eugene

Message:

copy max image ID to new header; modify verbosity

Location:

branches/eam_branches/ipp-20140904/Ohana/src

Files:

• dvomerge/src/dvorepairDeleteImagesByExternID.c (modified) (3 diffs)
• libdvo/src/dvo_image.c (modified) (1 diff)

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

@@ -119 +119 @@
     NdeleteImages ++;
 
-    if (VERBOSE) fprintf (stderr, "delete extern ID: %d = image ID %d (seq %d)\n", externID, image[n].imageID, n);
+    if (VERBOSE) fprintf (stderr, "delete %s extern ID: %d = image ID %d (seq %d)\n", image[n].name, externID, image[n].imageID, n);
   }
 
@@ -455 +455 @@
   for (i = 0; i < Nimage; i++) {
     if (deleteImage[i]) { 
-      fprintf (stderr, "%s : %d : %d : %d\n", image[i].name, image[i].imageID, image[i].parentID, image[i].externID);
+      fprintf (stderr, "DELETE: %s : %d : %d : %d\n", image[i].name, image[i].imageID, image[i].parentID, image[i].externID);
       continue;
     }
@@ -503 +503 @@
   // I want to keep the old DVO_DBID
   char dbID[33];
+  int imageIDmax;
   if (!gfits_scan (&oldDB->header, "DVO_DBID", "%s", 1, dbID)) {
     fprintf (stderr, "source image table is missing DVO_DBID, exiting\n");
     exit (3);
   }
+  if (!gfits_scan (&oldDB->header, "IMAGEID", "%d", 1, &imageIDmax)) {
+    fprintf (stderr, "max image ID is missing, exiting\n");
+    exit (3);
+  }
+  gfits_modify (&db.header, "IMAGEID", "%d", 1, imageIDmax);      
   gfits_modify (&db.header, "DVO_DBID", "%s", 1, dbID);      
 

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_image.c

@@ -255 +255 @@
   srand48(A);
   
-  fprintf (stderr, "%ld : %f\n", A, drand48());
-
   int i;
   for (i = 0; i < 32; i++) {