Remove duplicate fields from WQ

Author: ibmmqmet

.gitignore

@@ -9,3 +9,5 @@ src/Bip*
 csq*
 /src/t2
 /src/t3
+/testing/data/SMF*
+/tmp/*

README.md

@@ -33,6 +33,9 @@ March 2016 - Initial release
 April 2016 - Update to support MQ V9 pageset statistics
              Improved formatting for import to Access
              Fixed some mis-labelled columns
+June  2016 - Add the "hidden" WTASCORR field
+             Print the buildtime to help know what version is in use
+             Clearer printing of which records were unrecognised
 
 Pull requests
 =============

bin/aix/mqsmfcsv

@@ -81,11 +81,8 @@ void printWQ(wq *p)
   ADDU32 ("GETA   ",p->geta);
   ADDU32 ("GETS   ",p->gets);
   ADDU32 ("GETERR ",p->geterr);
-  ADDU32 ("GETDVAL",p->getdval);
   ADDSTCK("GETJWET",p->getjwet);
-  ADDSTCK("GETJCET",p->getjcet);
   ADDU32 ("GETJWN ",p->getjwn);
-  ADDU32 ("GETJCN ",p->getjcn);
   ADDSTCK("GETPSET",p->getpset);
   ADDU32 ("GETPSN ",p->getpsn);
   ADDSTCK("GETSUSET",p->getsuset);
@@ -100,30 +97,23 @@ void printWQ(wq *p)
   ADDSTCK("PUTET", p->putet);
   ADDSTCK("PUTCT", p->putct);
   ADDU32 ("PUTN   ",p->putn);
-  ADDU32 ("PUTPWG ",p->putpwg);
   ADDU32 ("PUTIGQ ",p->putigq);
   ADDSTCK("PUTJWET",p->putjwet);
-  ADDSTCK("PUTJCET",p->putjcet);
   ADDU32 ("PUTJWN ",p->putjwn);
-  ADDU32 ("PUTJCN ",p->putjcn);
   ADDSTCK("PUTSUSET",p->putsuset);
   ADDU32 ("PUTSUSN",p->putsusn);
   ADDSTCK("PUTPSET",p->putpset);
   ADDU32 ("PUTPSN ",p->putpsn);
-  ADDU32 ("PUTDDLY",p->putddly);
 
   /*--------------------------------------------------------*/
   /* Put1   - information                                   */
   /*-------------------------------------------------------*/
   ADDSTCK("PUT1ET",   p->put1et);
   ADDSTCK("PUT1CT",   p->put1ct);
   ADDU32 ("PUT1N  "  ,p->put1n);
-  ADDU32 ("PUT1PWG"  ,p->put1pwg);
   ADDU32 ("PUT1IGQ"  ,p->put1igq);
   ADDSTCK("PUT1JWET" ,p->put1jwet);
-  ADDSTCK("PUT1JCET" ,p->put1jcet);
   ADDU32 ("PUT1JWN"  ,p->put1jwn);
-  ADDU32 ("PUT1JCN"  ,p->put1jcn);
   ADDSTCK("PUT1SUSET",p->put1suset);
   ADDU32 ("PUT1SUSN" ,p->put1susn);
   ADDSTCK("PUT1PSET" ,p->put1pset);
@@ -143,9 +133,7 @@ void printWQ(wq *p)
   ADDSTCK("SETCT", p->setct);
   ADDU32 ("SETN  ",p->setn);
   ADDSTCK("SETJWET", p->setjwet);
-  ADDSTCK("SETJCET", p->setjcet);
   ADDU32 ("SETJWN ",p->setjwn);
-  ADDU32 ("SETJCN ",p->setjcn);
 
   /*--------------------------------------------------------*/
   /* other  - information                                   */
@@ -158,7 +146,7 @@ void printWQ(wq *p)
   /* Byte counts and persistent data information            */
   /* The MINMS values for put/get are initially set to      */
   /* 0x0FFFFFFF, and appear that way in the SMF report if   */
-  /* noputs/gets have touched that queue.  But that looks   */
+  /* no puts/gets have touched that queue.  But that looks  */
   /* ugly, so I'm turning them to -1.                       */
   /*--------------------------------------------------------*/
   if (conv32(p->getminms) == 0x0FFFFFFF)
@@ -257,7 +245,7 @@ void printWQ(wq *p)
     ADDSTCK("TOPICCLOSESRB ", p->topicclosesrb);
   }
 
-  if (conv32(p->wqver) > 8)
+  if (conv32(p->wqver) >= 8)
   {
      ADDU32("PUTDDLY",p->putddly);
   }