synchronise binaries

Author: ibmmqmet

bin/aix/mqsmfcsv

@@ -268,6 +268,9 @@ int main( int argc, char *argv[] )
     /* amount.                                                          */
     /********************************************************************/
     nextLength = conv16(pSMFRecord->Header.SMFLEN) - 4;
+    if (debugLevel >=3)
+      printf("   NextLen = %d bytes \n",nextLength);
+
     bytesRead = fread(&pSMFRecord->Header.SMFRECFLG, 1, nextLength , fp);
     if (bytesRead != nextLength)
     {
@@ -296,6 +299,9 @@ int main( int argc, char *argv[] )
         nextLength = conv16(nextLength);
         fread(&pSMFRecord->Header.SMFSEG ,1,2,fp);
 
+        if (debugLevel >=3)
+          printf("   NextLen = %d bytes \n",nextLength);
+
         if (offset+nextLength > sizeof(dataBuf))
         {
           printf("SMF record appears to be too large for buffer\n");
@@ -308,6 +314,9 @@ int main( int argc, char *argv[] )
 
     }
 
+    if (debugLevel >=3)
+      printf("Read a full record of %d bytes \n",offset);
+
     totalRecords++;
 
     /*********************************************************************/
@@ -399,6 +408,9 @@ int main( int argc, char *argv[] )
         hund);
     }
 
+    if (debugLevel >= 2)
+      printDEBUG("FULL RECORD",dataBuf,offset);
+
     if (recordType == 116 || recordType == 115)
     {
       /*******************************************************************/
@@ -444,7 +456,7 @@ int main( int argc, char *argv[] )
     /*********************************************************************/
     /* One we know how many sections there are, copy the triplet values  */
     /* into a local array, doing the endianness conversion on the way.   */
-    /* That makes it look at bit easier rather than than having convxxx  */
+    /* That makes it look a  bit easier rather than than having convxxx  */
     /* function calls everywhere else.                                   */
     /*********************************************************************/
     for (i=0;i<sectionCount;i++)
@@ -454,8 +466,6 @@ int main( int argc, char *argv[] )
       triplet[i].n       = conv16(pSMFRecord->s[i].n);
     }
 
-    if (debugLevel >= 2)
-      printDEBUG("FULL RECORD",dataBuf,offset);
 
     /*********************************************************************/
     /* And now we can start formatting the actual data.                  */

bin/linux/mqsmfcsv

@@ -40,8 +40,11 @@ void openDDL(char *name)
 
 void closeDDL(void)
 {
-  fprintf(fp,");\n\n");
-  fflush(fp);
+  if (fp)
+  {
+    fprintf(fp,");\n\n");
+    fflush(fp);
+  }
   return;
 }
 
@@ -52,25 +55,26 @@ void printDDL(char *name, int type, int len)
   char nameCopy[COL_HEAD_LEN];  /* Cannot modify fixed strings, have to copy input*/
 
   if (!fp)
-   return;
+    return;
+
   strncpy(nameCopy,name,sizeof(nameCopy)-1);
 
   switch (type)
   {
   case DDL_I:
-    fprintf(fp,"%s \"%s\" \t INTEGER\n",comma,format(nameCopy));
+    fprintf(fp,"%s %s \t INTEGER\n",comma,format(nameCopy));
     break;
   case DDL_I64:
-    fprintf(fp,"%s \"%s\" \t BIGINT\n",comma,format(nameCopy));
+    fprintf(fp,"%s %s \t BIGINT\n",comma,format(nameCopy));
     break;
   case DDL_C:
-    if (!strcmp(name,"Date")) /* special case for CommonHeader field */
+    if (!strcmp(name,"Date"))        /* special case for CommonHeader field*/
     {
-      fprintf(fp,"%s \"%s\" \t DATE    \n",comma,format(nameCopy));
+      fprintf(fp,"%s %s \t DATE    \n",comma,format(nameCopy));
     }
     else
     {
-      fprintf(fp,"%s \"%s\" \t CHAR(%d)\n",comma,format(nameCopy),len);
+      fprintf(fp,"%s %s \t CHAR(%d)\n",comma,format(nameCopy),len);
     }
     break;
   case DDL_SUS:
@@ -81,12 +85,12 @@ void printDDL(char *name, int type, int len)
 
     p2 = strstr(nameCopy,"(S)");
     if (p2) *p2 = 0;
-    fprintf(fp,"%s \"%s_s\" \t INTEGER\n",comma,format(nameCopy));
+    fprintf(fp,"%s %s_s \t INTEGER\n",comma,format(nameCopy));
 
     p = p+1;
     p2 = strstr(p,"(US)");
     if (p2) *p2 = 0;
-    fprintf(fp,"%s \"%s_us\" \t INTEGER\n",comma,format(p));
+    fprintf(fp,"%s %s_us \t INTEGER\n",comma,format(p));
     break;
 
   case DDL_DATETIME:
@@ -97,12 +101,12 @@ void printDDL(char *name, int type, int len)
 
     p2 = strstr(nameCopy," (DATE)");
     if (p2) *p2 = 0;
-    fprintf(fp,"%s \"%s_Date\" \t DATE\n",comma,format(nameCopy));
+    fprintf(fp,"%s %s_Date \t DATE\n",comma,format(nameCopy));
 
     p = p+1;
     if (p2) p2 = strstr(p," (TIME)");
     *p2 = 0;
-    fprintf(fp,"%s \"%s_Time\" \t CHAR(19)\n",comma,format(p));
+    fprintf(fp,"%s %s_Time \t CHAR(19)\n",comma,format(p));
     break;
   }
 

bin/win/mqsmfcsv.exe

@@ -0,0 +1,24 @@
+db2 connect to mydb
+db2 -tf c:\temp\smf\out\smf-mqtables.ddl
+
+db2 load client from c:\temp\smf\out\SMF-Q5ST.csv of del insert into mqsmf.Q5ST
+db2 load client from c:\temp\smf\out\SMF-QEST.csv of del insert into mqsmf.QEST
+db2 load client from c:\temp\smf\out\SMF-QIST.csv of del insert into mqsmf.QIST
+
+db2 load client from c:\temp\smf\out\SMF-QJST.csv of del insert into mqsmf.QJST
+db2 load client from c:\temp\smf\out\SMF-QLST.csv of del insert into mqsmf.QLST
+
+db2 load client from c:\temp\smf\out\SMF-QMAC.csv of del insert into mqsmf.QMAC
+db2 load client from c:\temp\smf\out\SMF-QMST.csv of del insert into mqsmf.QMST
+db2 load client from c:\temp\smf\out\SMF-QPST.csv of del insert into mqsmf.QPST
+db2 load client from c:\temp\smf\out\SMF-QSST.csv of del insert into mqsmf.QSST
+db2 load client from c:\temp\smf\out\SMF-QTST.csv of del insert into mqsmf.QTST
+db2 load client from c:\temp\smf\out\SMF-WQ.csv   of del insert into mqsmf.WQ
+db2 load client from c:\temp\smf\out\SMF-WTAS.csv of del insert into mqsmf.WTAS
+db2 load client from c:\temp\smf\out\SMF-WTID.csv of del insert into mqsmf.WTID
+db2 load client from c:\temp\smf\out\SMF-QESD.csv    of del insert into mqsmf.QESD
+db2 load client from c:\temp\smf\out\SMF-QCTDSP.csv  of del insert into mqsmf.QCTDSP
+db2 load client from c:\temp\smf\out\SMF-QCTDNS.csv  of del insert into mqsmf.QCTDNS
+db2 load client from c:\temp\smf\out\SMF-QCTADP.csv  of del insert into mqsmf.QCTADP
+db2 load client from c:\temp\smf\out\SMF-QCST.csv    of del insert into mqsmf.QCST
+db2 load client from c:\temp\smf\out\SMF-QCCT.csv    of del insert into mqsmf.QCCT