Changeset 15174

Timestamp:

Oct 3, 2007, 10:16:49 AM (19 years ago)

Author:

Paul Price

Message:

An 'empty' PHU may have up to and including 8 keywords.

File:

• branches/pap_branch_070920/psLib/src/fits/psFitsHeader.c (modified) (5 diffs)

branches/pap_branch_070920/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.34.4.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-03 03:01:45 $
+ *  @version $Revision: 1.34.4.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-03 20:16:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -72 +72 @@
     PS_ASSERT_FITS_NON_NULL(fits, false);
 
-    if (!fits->compression) {
+    if (!fits->compConvention) {
         // User has turned off compression conventions; doesn't want any nasty surprises
         return false;
@@ -90 +90 @@
     int status = 0;                     // CFITSIO status
     fits_get_hdrspace(fits->fd, &numKeys, 0, &status);
-    if (numKeys >= NUM_EMPTY_KEYS) {
+    if (numKeys > NUM_EMPTY_KEYS) {
         return false;
     }
@@ -140 +140 @@
 
     return false;
+}
+
+char *p_psFitsHeaderParseString(char *string)
+{
+    if (!string || strlen(string) == 0) {
+        return string;
+    }
+
+    char *fixed = string;       // Fixed version of the string
+    // remove the single-quotes at front/end
+    if (fixed[0] == '\'' && fixed[strlen(string)-1] == '\'') {
+        string[strlen(string)-1] = '\0'; // Remove the trailing quote
+        fixed += 1; // Advance past the leading quote
+    }
+    // Remove trailing spaces, which are not significant, according to the FITS standard
+    // http://archive.stsci.edu/fits/fits_standard/node31.html
+    char *lastSpace = NULL; // The last space in the string
+    while (strlen(fixed) > 1 && (lastSpace = strrchr(fixed, ' ')) && lastSpace[1] == '\0') {
+        // This is a trailing space, not a leading space.
+        lastSpace[0] = '\0'; // Truncate the string here
+    }
+
+    return fixed;
 }
 
@@ -217 +240 @@
             break;
         case 'C': {
-                char *keyValueFixed = keyValue; // Fixed version of the string
-                // remove the single-quotes at front/end
-                if (keyValueFixed[0] == '\'' && keyValueFixed[strlen(keyValue)-1] == '\'') {
-                    keyValue[strlen(keyValue)-1] = '\0'; // Remove the trailing quote
-                    keyValueFixed += 1; // Advance past the leading quote
-                }
-                // Remove trailing spaces, which are not significant, according to the FITS standard
-                // http://archive.stsci.edu/fits/fits_standard/node31.html
-                char *lastSpace = NULL; // The last space in the string
-                while (strlen(keyValueFixed) > 1 && (lastSpace = strrchr(keyValueFixed, ' ')) &&
-                        lastSpace[1] == '\0') {
-                    // This is a trailing space, not a leading space.
-                    lastSpace[0] = '\0'; // Truncate the string here
-                }
-
-                // Need to trap NAN, INF and -INF written by psFitsWriteHeader.
-                // cfitsio won't write these, so we write them as strings, and then have to trap them on read.
-                if (strcasecmp(keyValueFixed, "NAN") == 0) {
-                    success = psMetadataAddF32(header, PS_LIST_TAIL, keyName, dupFlag, keyComment, NAN);
-                } else if (strcasecmp(keyValueFixed, "INF") == 0) {
-                    success = psMetadataAddF32(header, PS_LIST_TAIL, keyName, dupFlag, keyComment, INFINITY);
-                } else if (strcasecmp(keyValueFixed, "-INF") == 0) {
-                    success = psMetadataAddF32(header, PS_LIST_TAIL, keyName, dupFlag, keyComment, -INFINITY);
-                } else {
-                    success = psMetadataAddStr(header, PS_LIST_TAIL, keyName, dupFlag, keyComment,
-                                               keyValueFixed);
-                }
-                break;
+            char *keyValueFixed = p_psFitsHeaderParseString(keyValue); // Fixed version of the string
+
+            // Need to trap NAN, INF and -INF written by psFitsWriteHeader.
+            // cfitsio won't write these, so we write them as strings, and then have to trap them on read.
+            if (strcasecmp(keyValueFixed, "NAN") == 0) {
+                success = psMetadataAddF32(header, PS_LIST_TAIL, keyName, dupFlag, keyComment, NAN);
+            } else if (strcasecmp(keyValueFixed, "INF") == 0) {
+                success = psMetadataAddF32(header, PS_LIST_TAIL, keyName, dupFlag, keyComment, INFINITY);
+            } else if (strcasecmp(keyValueFixed, "-INF") == 0) {
+                success = psMetadataAddF32(header, PS_LIST_TAIL, keyName, dupFlag, keyComment, -INFINITY);
+            } else if (!fits->compConvention ||
+                       (strcmp(keyName, "EXTNAME") != 0 || strcmp(keyValueFixed, "COMPRESSED_IMAGE") != 0)) {
+                // Ignore EXTNAME=COMPRESSED_IMAGE if compression convention is to be respected
+                success = psMetadataAddStr(header, PS_LIST_TAIL, keyName, dupFlag, keyComment,
+                                           keyValueFixed);
             }
+            break;
+        }
         case 'L': {
-                bool temp = (keyValue[0] == 'T') ? 1 : 0;
-                success = psMetadataAddBool(header, PS_LIST_TAIL, keyName, dupFlag, keyComment, temp);
-                break;
-            }
+            bool temp = (keyValue[0] == 'T') ? 1 : 0;
+            success = psMetadataAddBool(header, PS_LIST_TAIL, keyName, dupFlag, keyComment, temp);
+            break;
+        }
         default:
             psError(PS_ERR_IO, true, _("Specified FITS metadata type, %c, is not supported."), keyType);