Move formatting to real functions to pave way for potential new formats

Author: ibmmqmet

bin/aix/convH

@@ -7,6 +7,7 @@ SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \
       smfConv.c \
+      smfPrint.c \
       printDEBUG.c \
       printQ5ST.c    \
       printQCST.c    \

bin/aix/mqsmfcsv

@@ -4,6 +4,7 @@ CFLAGS= -I.
 PLATFLAGS=
 SRC = \
       smfDDL.c \
+      smfPrint.c \
       smfDate.c \
       smfConv.c \
       printDEBUG.c \

bin/linux/convH

@@ -4,6 +4,7 @@ SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \
       smfConv.c \
+      smfPrint.c \
       printDEBUG.c \
       printQ5ST.c    \
       printQCST.c    \

bin/linux/mqsmfcsv

@@ -113,12 +113,9 @@ int   debugLevel = 0;
 BOOL  addEquals = TRUE;
 BOOL  printHeaders = TRUE;
 BOOL  useRDW = TRUE;
-BOOL  sqlMode = FALSE;
 commonFields_t commonF = {0};
+enum outputFormat_e outputFormat = OF_CSV;
 
-char headings[HEADINGS_LEN];    /* Ensure these are big enough for any line*/
-char dataline[DATA_LEN];
-char tmpHead[64];                     /* Working space for a column heading*/
 unsigned int   recordType;
 unsigned short   recordSubType;
 
@@ -249,12 +246,14 @@ int main( int argc, char *argv[] )
       case 'f':
         for (i=0;i<strlen(mqoptarg);i++)
           mqoptarg[i] = toupper(mqoptarg[i]);
-        if (!strcmp(mqoptarg,"NORDW"))
+        if (strstr(mqoptarg,"NORDW"))
           useRDW = FALSE;
-        else if (!strcmp(mqoptarg,"RDW"))
+        else if (strstr(mqoptarg,"RDW"))
           useRDW = TRUE;
-        else
-          error = TRUE;
+        if (strstr(mqoptarg,"JSON"))
+          outputFormat = OF_JSON;
+        else if (strstr(mqoptarg,"SQL"))
+          outputFormat = OF_SQL;
         break;
       case 'h':
         for (i=0;i<strlen(mqoptarg);i++)
@@ -275,7 +274,7 @@ int main( int argc, char *argv[] )
         addEquals = 0;
         break;
       case 's':
-        sqlMode = TRUE;
+        outputFormat = OF_SQL;
         printHeaders = FALSE;
         addEquals = 0;
         break;
@@ -310,6 +309,12 @@ int main( int argc, char *argv[] )
   /* Windows requires the "b" option for binary input. And force       */
   /* stdin to binary in case we need to read from that too.            */
   /*********************************************************************/
+  if (!inputFile && !useRDW)
+  {
+    printf("Cannot use NORDW format input via stdin piping\n");
+    exit(1);
+  }
+
   #ifdef _WIN32
   setmode(fileno(stdin), O_BINARY);
   #endif
@@ -320,6 +325,11 @@ int main( int argc, char *argv[] )
       inputFile,strerror(errno),errno);
     goto mod_exit;
   }
+  /* Make sure we've got a printable name */
+  if (!inputFile)
+  {
+    inputFile = "<<stdin>>";
+  }
 
   fstat(fileno(fp),&statbuf);
   totalFileSize = statbuf.st_size;
@@ -361,9 +371,9 @@ int main( int argc, char *argv[] )
   /********************************************************************/
   currentOffset = startingOffset;
   totalRecords = startingRecords;
-  seekRc = fseeko(fp,currentOffset,SEEK_SET);
+  seekRc = (currentOffset!=0)?fseeko(fp,currentOffset,SEEK_SET):0;
   if (seekRc == -1) {
-    printf("Cannot move to correct offset for input file");
+    printf("Cannot move to correct offset for input file - error %s (%d)\n",strerror(errno),errno);
     goto mod_exit;
   }
 
@@ -451,7 +461,11 @@ int main( int argc, char *argv[] )
     }
     else
     {
-      fseeko(fp,currentOffset,SEEK_SET);
+      seekRc = fseeko(fp,currentOffset,SEEK_SET);
+      if (seekRc == -1) {
+        printf("Cannot move to correct offset for input file - error %s (%d)\n",strerror(errno),errno);
+        goto mod_exit;
+      }
       bytesRead = fread(&pSMFRecord->Header.SMFRECFLG,1,32768,fp);
       offset = bytesRead;
       offsetCorrection = 4;
@@ -529,7 +543,7 @@ int main( int argc, char *argv[] )
       time = time - (min * 60);
       sec = time % 60;
 
-      if (sqlMode)
+      if (outputFormat == OF_SQL)
         sep = "-";
       else
         sep = "/";

bin/win/mqsmfcsv.exe

@@ -248,26 +248,24 @@ extern char *strCfStatType  (int v);
 /*     SMFPRINTSTOP;                                      */
 /*   }                                                    */
 /**********************************************************/
-#define ADDHEAD(h,type,len) \
-  if (first && h)  \
-  {                \
-    offsetH += snprintf(&headings[offsetH],HEADINGS_LEN - offsetH, "%s,", h); \
-    if (offsetH > HEADINGS_LEN) \
-    {                               \
-      printf("HEADINGS buffer needs to be bigger than %d bytes.\n",HEADINGS_LEN); \
-      exit(1);                      \
-    }                               \
-    if (sqlMode) \
-    printDDL(h,type,len); \
-  }
+extern FILE *smfPrintStart(char *,void *,size_t,BOOL *,BOOL *);
+extern void  smfPrintStop(FILE *,BOOL, BOOL *);
+extern void  smfAddHead(BOOL first,char *h,int type,int len);
+extern void  smfAddData(char *fmt,...);
 
-#define ADDDATA(fmt,...)  \
-  offsetD+=snprintf(&dataline[offsetD],DATA_LEN-offsetD,fmt,__VA_ARGS__); \
-  if (offsetD > DATA_LEN)                \
-  {                                      \
-      printf("DATA buffer needs to be bigger than %d bytes.\n",DATA_LEN); \
-      exit(1);                           \
-  }
+#define SMFPRINTGLOB \
+  static BOOL first = TRUE;\
+  static BOOL newFile = TRUE;\
+  static FILE *fp = NULL
+
+#define SMFPRINTSTART(n,p,l) \
+  fp = smfPrintStart(n,p,l,&first,&newFile);
+
+#define SMFPRINTSTOP \
+  smfPrintStop(fp, newFile, &first);
+
+#define ADDHEAD(a,b,c) smfAddHead(first,a,b,c)
+#define ADDDATA(f,...) smfAddData(f,__VA_ARGS__)
 
 #define ADDS64(h,v) \
   ADDHEAD(h,DDL_I64,0); \
@@ -332,15 +330,15 @@ extern char *strCfStatType  (int v);
   ADDDATA("%s,",convDate(v))
 
 #define ADDSTCK(h,v) \
-  if (sqlMode) \
+  if (outputFormat == OF_SQL) \
   sprintf(tmpHead,"%s(US)",h); \
   else\
   sprintf(tmpHead,"%s(S),%s(US)",h,h); \
   ADDHEAD(tmpHead,DDL_SUS,0); \
   ADDDATA("%s,",convSecUSec(v))
 
 #define ADDSTCKIDX(h,idx,v) \
-  if (sqlMode) \
+  if (outputFormat == OF_SQL) \
   sprintf(tmpHead,"%s{%s}(US)",h,idx); \
   else \
   sprintf(tmpHead,"%s{%s}(S),%s{%s}(US)",h,idx,h,idx); \
@@ -349,11 +347,11 @@ extern char *strCfStatType  (int v);
 
 /* Add ASCII string, known length - underpins the other ADDSTRxx macros */
 #define ADDSTRN(h,v,l,maxlen) \
-  ADDHEAD(h,DDL_C,maxlen); \
-  { char *equ=""; \
-  if (looksLikeNum(l,v) && addEquals) equ="="; \
-  ADDDATA("%s\"%-*.*s\",",equ,l,l,v) \
-  }
+   ADDHEAD(h,DDL_C,maxlen); \
+   { char *equ=""; \
+     if (looksLikeNum(l,v) && addEquals) equ="="; \
+        ADDDATA("%s\"%-*.*s\",",equ,l,l,v);\
+   }
 
 #define ADDSTR(h,v,maxlen) \
   ADDSTRN(h,v,strlen(v),maxlen)             /* ASCII string null terminated*/
@@ -372,61 +370,12 @@ extern char *strCfStatType  (int v);
   if (first) sprintf(tmpHead,"%s {%s}",h,idx); \
   ADDSTREN(tmpHead,v,l)                      /* EBCDIC string, known length*/
 
-#define COMMON_BLOCK \
-  ADDSTR ("Date",commonF.recordDate,8); \
-  ADDSTR ("Time",commonF.recordTime,16); \
-  ADDSTRN("LPAR",commonF.systemId,4,4); \
-  ADDSTRN("QMgr",commonF.qMgr,4,4); \
-  ADDSTRN("MQ_Version",commonF.mqVer,3,3) \
-  if (recordType == 115 && commonF.intstart != 0) { \
-    unsigned long long du = conv64(commonF.intduration)/1000000L; \
-    ADDTIME("Interval_Start",commonF.intstart) \
-    ADDHEAD("Interval_Duration",DDL_I,0); \
-    if (recordSubType == 231) { \
-    ADDDATA("%llu,",du/4096L); \
-    } else { \
-    ADDDATA("%llu,",du); \
-    } \
-  }
-
-#define SMFPRINTSTART(n,p,l) \
-  int offsetH=0;  \
-  int offsetD=0;  \
-  char *tableName = n; \
-  if (debugLevel >=1 ) printDEBUG(n,p,(l));\
-  if (first) {    \
-    fp = fopencsv(n,&newFile);\
-    if (sqlMode) \
-      openDDL(n);   \
-  } \
-  if (!fp)        \
-  {               \
-    exit(1);      \
-  } \
-  COMMON_BLOCK
 
 #define ADDINDEX(n) \
   if (first) { \
     addIndex(n); \
   }
 
-#define SMFPRINTSTOP \
-  if (first && newFile && printHeaders)             \
-  {                      \
-    fprintf(fp,"%s",headings);\
-    fprintf(fp,"\n");    \
-  }                      \
-  if(first && sqlMode) \
-    closeDDL(tableName); \
-  first=FALSE;         \
-  fprintf(fp,"%s",dataline);\
-  fprintf(fp,"\n")
-
-#define SMFPRINTGLOB \
-  static BOOL first = TRUE;\
-  static BOOL newFile = TRUE;\
-  static FILE *fp = NULL
-
 /*****************************************/
 /* This isn't currently used. But it was */
 /* useful during initial debug.          */
@@ -450,9 +399,11 @@ extern unsigned char  EBCDIC_TO_ASCII[];
 extern int  debugLevel;
 extern BOOL  addEquals;
 extern BOOL  printHeaders;
-extern BOOL  sqlMode;
 extern unsigned int   recordType;
 extern unsigned short recordSubType;
 extern commonFields_t commonF;
 
+enum outputFormat_e { OF_SQL, OF_JSON, OF_CSV };
+extern enum outputFormat_e outputFormat;
+
 #endif

mqsmfcsv.doc

@@ -172,7 +172,7 @@ char *convSecUSec(unsigned long long s)
   }
 
   /* Separate fields by ',' for CSV formats */
-  if (sqlMode)
+  if (outputFormat == OF_SQL)
     sprintf(usecBuf,"%llu ",s);
   else
     sprintf(usecBuf,"%u, %u ",sec,usec);

src/Makefile.gcc.win

@@ -79,7 +79,7 @@ char * convDate(unsigned long long stcki)
   char *emptyTime;
   size_t offset;
 
-  if (sqlMode)
+  if (outputFormat == OF_SQL)
   { 
     epochTime = sqlEpoch;
     emptyTime = sqlEpoch;