Changeset 21059 for trunk/Ohana/src/libfits/header/F_modify.c

Timestamp:

Dec 30, 2008, 10:01:42 AM (18 years ago)

Author:

eugene

Message:

add ability to read HIERARCH keywords if basic keyword is not found

File:

• trunk/Ohana/src/libfits/header/F_modify.c (modified) (5 diffs)

trunk/Ohana/src/libfits/header/F_modify.c

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
-
-char *gfits_keyword_start (char *line);
-char *gfits_keyword_end (char *line);
-void pad_ending (char *line, char value, int Nbyte);
 
 int gfits_modify (Header *header, char *field, char *mode, int N,...) {
@@ -51 +47 @@
     strncpy (comment, qe, p + 80 - qe);
   }
-  pad_ending (comment, ' ', 82);  /* comment must contain spaces to the end */
+  gfits_pad_ending (comment, ' ', 82);  /* comment must contain spaces to the end */
 
   /* write the numeric modes */
@@ -96 +92 @@
     strncpy (data, qs, MAX (MIN (qe - qs, 71), 0));
     strncpy (comment, va_arg (argp, char *), 80);
-    pad_ending (comment, ' ', 82);  /* comment must contain spaces to the end */
+    gfits_pad_ending (comment, ' ', 82);  /* comment must contain spaces to the end */
     snprintf (string, 81, "%-8s= %s / %-s", field, data, comment);
     /* this will keep the original line, but truncate the comment */
@@ -156 +152 @@
   } else {
     while ((*c1 != ' ') && (c1 < line + 80)) c1++;
+  }
+  return (c1);
+}
+
+/* given a pointer to the FITS HIERARCH card field name, return pointer to the start of the data area */
+char *gfits_hierarch_keyword_start (char *line, char *field) {
+
+  char *c;
+
+  /* find the end of the existing data region */
+  c = line + strlen(field) + 1;
+  if (*c != '=') return (c);  /* non-data fields are not allowed */
+  
+  c += 2;
+  /* advance pointer over WHITESPACE */
+  while ((*c == ' ') && (c < line + 71)) { c++; }
+  
+  /* skip one quote mark */
+  if ((*c == 0x27) && (c < line + 71)) { c++; }
+
+  return (c);
+}
+
+/* given a pointer to the FITS HIERARCH card field name, return pointer to the end of the data area */
+char *gfits_hierarch_keyword_end (char *line, char *field) {
+
+  int done;
+  char *c1, *c2;
+
+  /* find the end of the existing data region */
+  c1 = line + strlen(field) + 1;
+  if (*c1 != '=') return (NULL);  /* non-data fields are not allowed */
+  c1 += 2;
+
+  /* advance pointer over WHITESPACE */
+  while ((*c1 == ' ') && (c1 < line + 71)) { c1++; }
+  
+  if (c1[0] == 0x27) { /* entry a string, skip over 'fred' */
+    for (done = FALSE, c2 = c1 + 1; !done && (c2 < line + 71); c2++) {
+      if ((c2[0] == 0x27) && (c2[1] == 0x27)) {
+        c2 += 2;
+        continue;
+      }
+      if (c2[0] == 0x27) {
+        c1 = c2;
+        done = TRUE;
+      }
+    }
+    if (!done) { /* error in line: mismatched ' chars, return fixed position */
+      c1 = line + 30;
+    }
+  } else {
+    while ((*c1 != ' ') && (c1 < line + 71)) c1++;
   }
   return (c1);
@@ -171 +220 @@
 
 /* fill 'line' with Nbyte space from first NULL to last byte with value */
-void pad_ending (char *line, char value, int Nbyte) {
+void gfits_pad_ending (char *line, char value, int Nbyte) {
   
   char *p;