Correct use of Inq() in samples - issue #107

Author: ibmmqmet

CHANGELOG.md

@@ -1,11 +1,12 @@
 # Changelog
 Newest updates are at the top of this file.
 
-## May 31 2019
+## May 31 2019 - v4.0.6
 * mqmetric - Allow limited monitoring of V8 Distributed platforms
 (set `ibmmq.usePublications` to *false* to enable in monitor programs) #104
 * mqmetric - Added queue_attribute_max_depth to permit %full calculation 
 (set `ibmmq.useStatus` to *true* to enable in monitor programs) #105
+* samples - Correct use of the new form of the Inq() verb
 
 ## April 23 2019
 * Fixed memory leak in InqMP

buildInDocker.sh

@@ -44,3 +44,6 @@ do
   echo "Building program: $exe"
   go build -o bin/$exe $samp
 done
+
+echo "Building program: mqitest"
+go build -o bin/mqitest $srcdir/mqitest/mqitest.go

samples/README.md

@@ -28,7 +28,7 @@ Current samples in this directory include
 * amqsconn.go: How to programmatically connect as an MQ client to a remote queue manager.
 Allow use of a userid/password for authentication. There are no default values for this sample.
 * amqsprop.go: Set and extract message properties
-* amqsinq.go : Demonstrate the new InqMap API for inquiring about object attributes
+* amqsinq.go : Demonstrate the Inq API for inquiring about object attributes
 * amqsset.go : Demonstrate how to set attributes of an MQ object using the MQSET verb
 * amqscb.go  : Demonstrate use of the CALLBACK capability for asynchronous consumption of messages
 

samples/amqsinq.go

@@ -44,7 +44,7 @@ var object ibmmq.MQObject
  */
 func inquire(obj ibmmq.MQObject, selectors []int32) {
 	// This is the function to do the actual inquiry
-	values, err := obj.InqMap(selectors)
+	values, err := obj.Inq(selectors)
 	if err != nil {
 		fmt.Println(err)
 	} else {

samples/mqitest/mqitest.go

@@ -41,6 +41,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/ibm-messaging/mq-golang/ibmmq"
 )
@@ -102,7 +103,7 @@ func main() {
 		pmo.Options = ibmmq.MQPMO_SYNCPOINT | ibmmq.MQPMO_NEW_MSG_ID | ibmmq.MQPMO_NEW_CORREL_ID
 
 		putmqmd.Format = "MQSTR"
-		msgData := "Hello from Go"
+		msgData := "Hello from Go at " + time.Now().Format("02 Jan 2006 03:04:05")
 		buffer := []byte(msgData)
 
 		err = qObject.Put(putmqmd, pmo, buffer)
@@ -247,15 +248,14 @@ func main() {
 			ibmmq.MQCA_DEAD_LETTER_Q_NAME,
 			ibmmq.MQIA_MSG_MARK_BROWSE_INTERVAL}
 
-		intAttrs, charAttrs, err := qMgrObject.Inq(selectors, 2, 160)
+		values, err := qMgrObject.Inq(selectors)
 
 		if err != nil {
 			fmt.Println(err)
 		} else {
-			returnedName := string(charAttrs[0:48])
-			fmt.Printf("MQINQ returned +%v %s \n",
-				intAttrs, string(charAttrs))
-			fmt.Printf("               '%s'\n", returnedName)
+			returnedName := values[ibmmq.MQCA_Q_MGR_NAME]
+			fmt.Printf("MQINQ returned %v \n", values)
+			fmt.Printf("        QM is '%s'\n", returnedName)
 		}
 
 	}