Changeset 38966

Timestamp:

Oct 26, 2015, 8:49:46 PM (11 years ago)

Author:

eugene

Message:

adding noSeek option; adding fits_to_mysql function

Location:

branches/eam_branches/ipp-20150625/Ohana/src

Files:

• libfits/include/gfitsio.h (modified) (1 diff)
• libfits/table/F_read_T.c (modified) (2 diffs)
• tools/src/fits_to_mysql.c (added)

branches/eam_branches/ipp-20150625/Ohana/src/libfits/include/gfitsio.h

@@ -237 +237 @@
 int     gfits_fread_ftable             PROTO((FILE *f, FTable *ftable, char *extname)); 
 int     gfits_fread_ftable_data        PROTO((FILE *f, FTable *ftable, int padIfShort));
-int     gfits_fread_ftable_range       PROTO((FILE *f, int padIfShort, FTable *ftable, off_t start, off_t Nrows));
+int     gfits_fread_ftable_range       PROTO((FILE *f, int padIfShort, int noSeek, FTable *ftable, off_t start, off_t Nrows));
 int     gfits_fread_vtable             PROTO((FILE *f, VTable *vtable, char *extname, off_t Nrow, off_t *row));
 int     gfits_fread_vtable_range       PROTO((FILE *f, VTable *vtable, off_t start, off_t Nrows));

branches/eam_branches/ipp-20150625/Ohana/src/libfits/table/F_read_T.c

@@ -62 +62 @@
 
 /*********************** fits read ftable data ***********************************/
-int gfits_fread_ftable_range (FILE *f, int padIfShort, FTable *table, off_t start, off_t Nrows) {
+int gfits_fread_ftable_range (FILE *f, int padIfShort, int noSeek, FTable *table, off_t start, off_t Nrows) {
 
   off_t Nbytes, Nread, Nskip, Nx, Ny;
@@ -88 +88 @@
   }
 
-  fseeko (f, Nskip, SEEK_CUR);
+  if (!noSeek) {
+    fseeko (f, Nskip, SEEK_CUR);
+  }
 
   Nread = fread (table[0].buffer, sizeof (char), Nbytes, f);