Changeset 27435 for trunk/Ohana/src/opihi/dvo/imsearch.c

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/dvo/imsearch.c (modified) (3 diffs)

trunk/Ohana/src/opihi/dvo/imsearch.c

@@ -7 +7 @@
   Header header;
   RegImage *pimage;
-  int i, Nimage, status, N, TimeSelect, SaveNames;
+  off_t i, Nimage, status;
+  int N, TimeSelect, SaveNames;
   int ModeSelect, TypeSelect, CCDSelect, FilterSelect;
   char *Filter, *obstime;
@@ -102 +103 @@
     return (FALSE);
   }
-  fseek (f, header.size, SEEK_SET);
+  fseeko (f, header.datasize, SEEK_SET);
 
   /* load existing data from database */
-  gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
+  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
   ALLOCATE (pimage, RegImage, Nimage);
   status = fread (pimage, sizeof(RegImage), Nimage, f);
   fclose (f);
   if (status != Nimage) {
-    gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
+    gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
     gfits_free_header (&header);
     free (pimage);
@@ -130 +131 @@
     obstime[strlen(obstime)-1] = 0;
 
-    gprint (GP_LOG, "%5d %6s %6s %2d %2d   ", i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type);
+    gprint (GP_LOG, "%5lld %6s %6s %2d %2d   ", (long long) i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type);
     gprint (GP_LOG, "%s %s  ", pimage[i].pathname, pimage[i].filename);
     gprint (GP_LOG, "%s %s %f %s\n", pimage[i].filter, pimage[i].instrument, pimage[i].exptime, obstime);