Changeset 25321 for trunk/pstamp/src/pstampdump.c

Timestamp:

Sep 10, 2009, 12:01:54 PM (17 years ago)

Author:

bills

Message:

exit with PS_EXIT_DATA_ERROR if we don't understand the input file.
Allow EXTVER to be an integer to work around MOPS bug

File:

• trunk/pstamp/src/pstampdump.c (modified) (3 diffs)

trunk/pstamp/src/pstampdump.c

@@ -79 +79 @@
     if (!readFitsFile(fileName, dumpHeader ? &header : NULL, dumpTable ? &array : NULL)) {
         psErrorStackPrint(stderr, "failed to process fits table from: %s\n", fileName);
-        return 1;
+        return PS_EXIT_DATA_ERROR;
     }
     if (dumpHeader) {
@@ -85 +85 @@
         if (!extname) {
             psErrorStackPrint(stderr, "failed to find EXTNAME in fits header of: %s\n", fileName);
-            return 1;
+            return PS_EXIT_DATA_ERROR;
         }
         psString req_name = psMetadataLookupStr(NULL, header, "REQ_NAME");
         if (!req_name) {
             psErrorStackPrint(stderr, "failed to find REQ_NAME in fits header of: %s\n", fileName);
-            return 1;
+            return PS_EXIT_DATA_ERROR;
         }
         if (!strcmp(extname, "PS1_PS_REQUEST")) {
             psString extver = psMetadataLookupStr(NULL, header, "EXTVER");
             if (!extver) {
-                psErrorStackPrint(stderr, "failed to find EXTVER in fits header of: %s\n", fileName);
-                return 1;
+                // work around bug in MOPS request files
+                // Accept an integer for the version number
+                psS32 extver_num = psMetadataLookupS32(NULL, header, "EXTVER");
+                if (extver_num) {
+                    psStringAppend(&extver, "%d", extver_num);
+                } else {
+                    psErrorStackPrint(stderr, "failed to find EXTVER in fits header of: %s\n", fileName);
+                    return PS_EXIT_DATA_ERROR;
+                }
             }
             printf("%s %s %s\n", extname, extver, req_name);
@@ -104 +111 @@
         } else {
             psErrorStackPrint(stderr, "do not recognize extname: %s in %s\n", extname, fileName);
-            return 1;
+            return PS_EXIT_DATA_ERROR;
         }
     }