Changeset 27368 for branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_scan.c

Timestamp:

Mar 19, 2010, 5:35:25 PM (16 years ago)

Author:

eugene

Message:

update ohana formatting functions to check format and associated types; fixes derived from format checks

File:

• branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_scan.c (modified) (5 diffs)

branches/eam_branches/largefiles.20100314/Ohana/src/libfits/header/F_scan.c

@@ -2 +2 @@
 # include <gfitsio.h>
 
+// this only scans the regular and non-boolean fields
 int gfits_scan (Header *header, char *field, char *mode, int N,...) {
 
@@ -13 +14 @@
 }
   
+// alternate version for the special types (boolean, comments, COMMENT)
+int gfits_scan_alt (Header *header, char *field, char *mode, int N,...) {
+
+  int status;
+  va_list argp;
+  
+  va_start (argp, N);
+  status = gfits_vscan_alt (header, field, mode, N, argp);
+  va_end (argp);
+  return (status);
+}
+  
+// this only scans the regular and non-boolean fields
 int gfits_vscan (Header *header, char *field, char *mode, int N, va_list argp) {
 
@@ -27 +41 @@
   }
 
-  /* non-data entry (COMMENT, HISTORY) */
-  if (!strcmp (mode, "%S")) {
-    strncpy (va_arg (argp, char *), p + 8, FT_HISTORY_LENGTH);
-    return (TRUE);
-  }
-
   /* all others require '=' in column 8 */
   if (p[8] != '=') return (FALSE);
-
-  /* comment from data line */
-  if (!strcmp (mode, "%C")) {
-    q = gfits_keyword_end (p) + 3;
-    q = MIN (p + 80, q);
-    bzero (tmp, 81);
-    Nchar = MIN (80, p + 80 - q);
-    memcpy (tmp, q, Nchar);
-    stripwhite (tmp);
-    strcpy (va_arg (argp, char *), tmp);
-    return (TRUE);
-  }
 
   /* extract data into char array (exclude containing ' chars) */
@@ -61 +57 @@
   }
   
-  /* boolean data, requires int target */
-  if (!strcmp (mode, "%t")) {
-    s = gfits_keyword_start (p);
-    if (*s == 'T') {
-      *va_arg (argp, int *) = TRUE;
-      return (TRUE);
-    }
-    if (*s == 'F') {
-      *va_arg (argp, int *) = FALSE;   
-      return (TRUE);
-    }
-  }
-
   /* remaining options are numerical data */
   /* need to interpret 1.0d5 as 1.0e5 */
@@ -105 +88 @@
 }
 
+// alternate version for the special types (boolean, comments, COMMENT)
+int gfits_vscan_alt (Header *header, char *field, char *mode, int N, va_list argp) {
+
+  char *p, *q, *s, tmp[81];
+  int Nchar, status;
+
+  /* find the correct line with field */
+  p = gfits_header_field (header, field, N);
+  if (p == NULL) {
+    status = gfits_vscan_hierarch (header, field, mode, N, argp);
+    return (status);
+  }
+
+  /* non-data entry (COMMENT, HISTORY) */
+  if (!strcmp (mode, "%S")) {
+    strncpy (va_arg (argp, char *), p + 8, FT_HISTORY_LENGTH);
+    return (TRUE);
+  }
+
+  /* all others require '=' in column 8 */
+  if (p[8] != '=') return (FALSE);
+
+  /* comment from data line */
+  if (!strcmp (mode, "%C")) {
+    q = gfits_keyword_end (p) + 3;
+    q = MIN (p + 80, q);
+    bzero (tmp, 81);
+    Nchar = MIN (80, p + 80 - q);
+    memcpy (tmp, q, Nchar);
+    stripwhite (tmp);
+    strcpy (va_arg (argp, char *), tmp);
+    return (TRUE);
+  }
+
+  /* boolean data, requires int target */
+  if (!strcmp (mode, "%t")) {
+    s = gfits_keyword_start (p);
+    if (*s == 'T') {
+      *va_arg (argp, int *) = TRUE;
+      return (TRUE);
+    }
+    if (*s == 'F') {
+      *va_arg (argp, int *) = FALSE;   
+      return (TRUE);
+    }
+  }
+
+  /* no valid mode found */
+  return (FALSE);
+}
+
 # define HIERARCH_LENGTH 71
 int gfits_vscan_hierarch (Header *header, char *field, char *mode, int N, va_list argp) {