Changeset 35545 for branches/eam_branches/ipp-20130419/pstamp/src/pstampdump.c

Timestamp:

May 9, 2013, 11:25:56 AM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20130419/pstamp/src/pstampdump.c (modified) (2 diffs)

branches/eam_branches/ipp-20130419/pstamp/src/pstampdump.c

@@ -94 +94 @@
         if (!strcmp(extname, "PS1_PS_REQUEST")) {
             psString extver = psMetadataLookupStr(NULL, header, "EXTVER");
+            psString action = psMetadataLookupStr(NULL, header, "ACTION");
+            psString email = psMetadataLookupStr(NULL, header, "EMAIL");
             if (!extver) {
                 // work around bug in MOPS request files
@@ -105 +107 @@
                 }
             }
-            printf("%s %s %s\n", extname, extver, req_name);
+            if (!strcmp(extver, "1")) {
+                printf("%s %s %s\n", extname, extver, req_name);
+            } else {
+                if (!action) {
+                    psErrorStackPrint(stderr, "failed to find action in fits header of: %s\n", fileName);
+                    return PS_EXIT_DATA_ERROR;
+                }
+                if (!email) {
+                    psErrorStackPrint(stderr, "failed to find action in fits header of: %s\n", email);
+                    return PS_EXIT_DATA_ERROR;
+                }
+                printf("%s %s %s %s %s\n", extname, extver, req_name, action, email);
+            }
         } else if (!strcmp(extname, "PS1_PS_RESULTS")) {
             psS64 req_id = psMetadataLookupS64(NULL, header, "REQ_ID");