From efc04717f73171cfc6d441bc924e12657b3481e2 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Mon, 20 May 2019 22:16:49 +0800
Subject: [PATCH] test

---
 def.go     | 14 +++++++++-----
 rules.go   |  2 ++
 sql.go     |  4 ++++
 workers.go |  6 ++++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/def.go b/def.go
index 20b3360..c638257 100644
--- a/def.go
+++ b/def.go
@@ -207,11 +207,15 @@ const (
 	objSubTypeMessageSellReq         = 337 // /wts_xx (done)
 	objSubTypeMessageOrderbookReq    = 338 // /t_xx (done)
 	objSubTypeMessageOrderbookAck    = 339 // orderbook summary (not done)
-	objSubTypeMessageWithdrawReq     = 340 // /g_withdraw (not done)
-	objSubTypeMessageWithdrawCode    = 341 // code to receive (not done)
-	objSubTypeMessageWithdrawRcv     = 342 // Received msg (not done)
-	objSubTypeMessageDepositReq      = 343 // /g_deposit (not done)
-	objSubTypeMessageDepositAck      = 344 // Deposited successfully (not done)
+	objSubTypeMessageWithdrawReq     = 340 // /g_withdraw (done)
+	objSubTypeMessageWithdrawCode    = 341 // code to receive (done)
+	objSubTypeMessageWithdrawRcv     = 342 // Received msg (done)
+	objSubTypeMessageDepositReq      = 343 // /g_deposit (done)
+	objSubTypeMessageDepositAck      = 344 // Deposited successfully (done)
+	objSubTypeMessageStockReq        = 345 // /stock (done)
+	objSubTypeMessageStockAck        = 346 // result from /stock (not done)
+	objSubTypeMessageMiscReq         = 347 // /misc (done)
+	objSubTypeMEssageMiscAck         = 348 // result from /misc (not done)
 	objSubTypeJobPillage             = 601
 	objSubTypeJobTribute             = 602
 	objSubTypeJobStatus              = 603
diff --git a/rules.go b/rules.go
index 22b8bc5..fc86924 100644
--- a/rules.go
+++ b/rules.go
@@ -94,6 +94,8 @@ func resetMsgParsingRules() {
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessageDepositReq) + `, "Deposit Req", "^/g_deposit (?P<Item>[a-z0-9]+) (?P<Quantity>[0-9]+)$")
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessageDepositAck) + `, "Deposit Ack #2", "^Deposited successfully: (?P<Item>.*) \\((?P<Quantity>[0-9]+)\\)$")
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessageDepositAck) + `, "Deposit Ack #1", "^Deposited  (?P<Item>.*) \\((?P<Quantity>[0-9]+)\\) successfully$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessageStockReq) + `, "Stock Req", "^/stock$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessageMiscReq) + `, "Misc Req", "^/misc$")
 		;`)
 	failOnError(err, "resetMsgParsingRules : populate table msg_rules")
 }
diff --git a/sql.go b/sql.go
index 8f8f5fc..0c00b8b 100644
--- a/sql.go
+++ b/sql.go
@@ -365,6 +365,10 @@ func initDB() {
 						        ,(` + strconv.Itoa(objSubTypeMessageWithdrawRcv) + `, "withdraw_rcv", "Withdraw Received", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeMessageDepositReq) + `, "deposit_req", "Deposit Req", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeMessageDepositAck) + `, "deposit_ack", "Deposit Ack", ` + strconv.Itoa(objTypeMessage) + `)
+						        ,(` + strconv.Itoa(objSubTypeMessageStockReq) + `, "stock_req", "Stock Req", ` + strconv.Itoa(objTypeMessage) + `)
+						        ,(` + strconv.Itoa(objSubTypeMessageStockAck) + `, "stock_ack", "Stock Ack", ` + strconv.Itoa(objTypeMessage) + `)
+						        ,(` + strconv.Itoa(objSubTypeMessageMiscReq) + `, "misc_req", "Misc Req", ` + strconv.Itoa(objTypeMessage) + `)
+						        ,(` + strconv.Itoa(objSubTypeMEssageMiscAck) + `, "misc_ack", "Misc Ack", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeJobPillage) + `, "job_pillage", "Pillage job", ` + strconv.Itoa(objTypeJob) + `)
 						        ,(` + strconv.Itoa(objSubTypeJobTribute) + `, "job_tribute", "Tribute job", ` + strconv.Itoa(objTypeJob) + `)
 						        ,(` + strconv.Itoa(objSubTypeJobWithdrawal) + `, "job_withdraw", "Withdrawal job", ` + strconv.Itoa(objTypeJob) + `)
diff --git a/workers.go b/workers.go
index 6ac0d78..6187aa7 100644
--- a/workers.go
+++ b/workers.go
@@ -211,6 +211,12 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) {
 				case objSubTypeMessageDepositAck:
 					err = setObjSubTypeId(objId, objSubTypeMessageDepositAck)
 					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(DepositAck)")
+				case objSubTypeMessageStockReq:
+					err = setObjSubTypeId(objId, objSubTypeMessageStockReq)
+					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(StockReq)")
+				case objSubTypeMessageMiscReq:
+					err = setObjSubTypeId(objId, objSubTypeMessageMiscReq)
+					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(MiscReq)")
 				case objSubTypeMessageAuctionAnnounce:
 					cwm := ChatWarsMessageAuctionAnnounce{
 						ObjID64: objId,