Changeset 27838 for branches/tap_branches/Ohana/src/libfits/table/F_table_varlength.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libfits/table/F_table_varlength.c (modified) (5 diffs)

branches/tap_branches/Ohana/src/libfits/table/F_table_varlength.c

@@ -4 +4 @@
 int gfits_varlength_column_define (FTable *ftable, VarLengthColumn *def, int column) {
 
-  int i, Nv, Nb;
+  int i;
+  int Nv, Nb;
   char *p1, *p2, *p3;
   char field[81];
@@ -32 +33 @@
   // now p1 must be 'P';
   if (*p1 == 0) return (FALSE);
-  if (*p1 != 'P') return (FALSE);
+  if ((*p1 != 'P') && (*p1 != 'Q')) return (FALSE);
+  def->mode = *p1;
 
   // next value is the actual varlength column format
@@ -61 +63 @@
   }
 
-  if (!gfits_scan (ftable->header, "THEAP", "%d", 1, &def->heap_start)) {
+  // heap_start must be long long so file may be very large
+  if (!gfits_scan (ftable->header, "THEAP", "%lld", 1, (long long *) &def->heap_start)) {
     def->heap_start = ftable->header->Naxis[0]*ftable->header->Naxis[1];
   }
@@ -68 +71 @@
 }
 
-void *gfits_varlength_column_pointer (FTable *ftable, VarLengthColumn *column, int row, int *length) {
+// return the data and length for row 'row' of a variable length column
+// is this capable of handling large files (value holding length and offset is an int)?
+void *gfits_varlength_column_pointer (FTable *ftable, VarLengthColumn *column, off_t row, off_t *length) {
 
   void *result;
-  int offset, Nx, *ptr;
+  off_t offset, Nx;
+
+  if ((column->mode != 'P') && (column->mode != 'Q')) abort();
 
   // find the values for the specified row
@@ -89 +96 @@
 # endif
 
-  ptr = (int *) &ftable->buffer[row*Nx + column->Nstart];
-  *length = ptr[0];
-  offset = ptr[1];
+  if (column->mode == 'P') {
+    int *ptr;
+    ptr = (int *) &ftable->buffer[row*Nx + column->Nstart];
+    *length = ptr[0];
+    offset = ptr[1];
+  } else if (column->mode == 'Q') {
+    off_t *ptr;
+    ptr = (off_t *) &ftable->buffer[row*Nx + column->Nstart];
+    *length = ptr[0];
+    offset = ptr[1];
+  } else {
+        // this was actually trapped above
+        abort();
+  }
 
   result = (void *) (ftable->buffer + column->heap_start + offset);