Add ByteString and StringFilter as PCF output types

Author: ibmmqmet

ibmmq/mqiPCF.go

@@ -280,8 +280,50 @@ func (p *PCFParameter) Bytes() []byte {
 		endian.PutUint32(buf[offset:], uint32(len(p.String[0])))
 		offset += 4
 		copy(buf[offset:], []byte(p.String[0]))
+
+	case C.MQCFT_STRING_FILTER:
+		// Use "\000" as the string if you need an empty/null parameter
+		fv := p.Filter.FilterValue.(string)
+
+		buf = make([]byte, C.MQCFSF_STRUC_LENGTH_FIXED+roundTo4(int32(len(fv))))
+		offset := 0
+		endian.PutUint32(buf[offset:], uint32(p.Type))
+		offset += 4
+		endian.PutUint32(buf[offset:], uint32(len(buf)))
+		offset += 4
+		endian.PutUint32(buf[offset:], uint32(p.Filter.Parameter))
+		offset += 4
+		endian.PutUint32(buf[offset:], uint32(p.Filter.Operator))
+		offset += 4
+		endian.PutUint32(buf[offset:], uint32(C.MQCCSI_DEFAULT))
+		offset += 4
+		endian.PutUint32(buf[offset:], uint32(len(fv)))
+		offset += 4
+		copy(buf[offset:], []byte(fv))
+
+	// Expect to be given a string that can be decoded into bytes. For example, "aabb12".
+	// Return nil if the bytestring cannot be converted from the hex
+	case C.MQCFT_BYTE_STRING:
+		bs, err := hex.DecodeString(p.String[0])
+		if err != nil {
+			// Can't easily change to return or report the error without breaking existing apps.
+			logError("Trying to serialise PCF ByteString parameter \"%s\" : %v\n", p.String[0], err)
+			return nil
+		}
+		buf = make([]byte, C.MQCFST_STRUC_LENGTH_FIXED+roundTo4(int32(len(bs))))
+		offset := 0
+		endian.PutUint32(buf[offset:], uint32(p.Type))
+		offset += 4
+		endian.PutUint32(buf[offset:], uint32(len(buf)))
+		offset += 4
+		endian.PutUint32(buf[offset:], uint32(p.Parameter))
+		offset += 4
+		endian.PutUint32(buf[offset:], uint32(len(bs)))
+		offset += 4
+		copy(buf[offset:], bs)
+
 	default:
-		fmt.Printf("mqiPCF.go: Trying to serialise PCF parameter. Unknown PCF type %d\n", p.Type)
+		logError("mqiPCF.go: Trying to serialise PCF parameter. Unknown PCF type %d\n", p.Type)
 	}
 	return buf
 }

ibmmq/mqiattrs.go

@@ -59,7 +59,6 @@ int addNewCharAttrs(MQLONG a[],MQLONG l[]) {
 */
 import "C"
 import (
-	"fmt"
 	"os"
 	"sync"
 )
@@ -150,7 +149,7 @@ func getAttrInfo(attrs []int32) (int, int, int) {
 
 		if addedAttrs < 0 {
 			// Force an immediate exit if the arrays are not large enough.
-			fmt.Printf("Error: mqiattrs.go: MAX_NEW_MQCA_ATTRS is too small. Increase from %d\n", C.MAX_NEW_MQCA_ATTRS)
+			logError("mqiattrs.go: MAX_NEW_MQCA_ATTRS is too small. Increase from %d\n", C.MAX_NEW_MQCA_ATTRS)
 			os.Exit(1)
 		}
 		for i := 0; i < addedAttrs; i++ {

ibmmq/mqitrace.go

@@ -39,7 +39,15 @@ func SetTrace(b bool) {
 }
 
 func logTrace(format string, v ...interface{}) {
-	if tracing {
+	logInternal(tracing, format, v...)
+}
+
+func logError(format string, v ...interface{}) {
+	logInternal(true, "ERROR: "+format, v...)
+}
+
+func logInternal(force bool, format string, v ...interface{}) {
+	if force {
 		d := time.Now().Format("2006-01-02T15:04:05.000")
 		fmt.Fprintf(os.Stderr, "[ibmmq] %s : ", d)
 		fmt.Fprintf(os.Stderr, format, v...)