From f85b095cd556ed5e321acd8c3864a5e6798089fb Mon Sep 17 00:00:00 2001 From: shoopea Date: Fri, 11 Oct 2019 09:56:02 +0800 Subject: [PATCH] update withdraw rcv --- msg.go | 28 ++++++++++++++-------------- workers.go | 1 - 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/msg.go b/msg.go index 45b2fe7..5718f72 100644 --- a/msg.go +++ b/msg.go @@ -183,17 +183,19 @@ func parseSubTypeMessageReportAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWa func parseSubTypeMessageOrderbookAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMessageOrderbookAck, error) { cwm := ChatWarsMessageOrderbookAck{} - log.Printf("parseSubTypeMessageOrderbookAck : Orderbook identified\n") - log.Printf("parseSubTypeMessageOrderbookAck : Name : %s\n", r.ReplaceAllString(m.Text, "${Name}")) - log.Printf("parseSubTypeMessageOrderbookAck : Code : %s\n", r.ReplaceAllString(m.Text, "${Code}")) - log.Printf("parseSubTypeMessageOrderbookAck : Qty : %s\n", r.ReplaceAllString(m.Text, "${Qty}")) - log.Printf("parseSubTypeMessageOrderbookAck : Gold : %s\n", r.ReplaceAllString(m.Text, "${Gold}")) - log.Printf("parseSubTypeMessageOrderbookAck : Qty1 : %s\n", r.ReplaceAllString(m.Text, "${Qty1}")) - log.Printf("parseSubTypeMessageOrderbookAck : Price1 : %s\n", r.ReplaceAllString(m.Text, "${Price1}")) - log.Printf("parseSubTypeMessageOrderbookAck : Qty2 : %s\n", r.ReplaceAllString(m.Text, "${Qty2}")) - log.Printf("parseSubTypeMessageOrderbookAck : Price2 : %s\n", r.ReplaceAllString(m.Text, "${Price2}")) - log.Printf("parseSubTypeMessageOrderbookAck : Qty3 : %s\n", r.ReplaceAllString(m.Text, "${Qty3}")) - log.Printf("parseSubTypeMessageOrderbookAck : Price3 : %s\n", r.ReplaceAllString(m.Text, "${Price3}")) + /* + log.Printf("parseSubTypeMessageOrderbookAck : Orderbook identified\n") + log.Printf("parseSubTypeMessageOrderbookAck : Name : %s\n", r.ReplaceAllString(m.Text, "${Name}")) + log.Printf("parseSubTypeMessageOrderbookAck : Code : %s\n", r.ReplaceAllString(m.Text, "${Code}")) + log.Printf("parseSubTypeMessageOrderbookAck : Qty : %s\n", r.ReplaceAllString(m.Text, "${Qty}")) + log.Printf("parseSubTypeMessageOrderbookAck : Gold : %s\n", r.ReplaceAllString(m.Text, "${Gold}")) + log.Printf("parseSubTypeMessageOrderbookAck : Qty1 : %s\n", r.ReplaceAllString(m.Text, "${Qty1}")) + log.Printf("parseSubTypeMessageOrderbookAck : Price1 : %s\n", r.ReplaceAllString(m.Text, "${Price1}")) + log.Printf("parseSubTypeMessageOrderbookAck : Qty2 : %s\n", r.ReplaceAllString(m.Text, "${Qty2}")) + log.Printf("parseSubTypeMessageOrderbookAck : Price2 : %s\n", r.ReplaceAllString(m.Text, "${Price2}")) + log.Printf("parseSubTypeMessageOrderbookAck : Qty3 : %s\n", r.ReplaceAllString(m.Text, "${Qty3}")) + log.Printf("parseSubTypeMessageOrderbookAck : Price3 : %s\n", r.ReplaceAllString(m.Text, "${Price3}")) + */ return &cwm, nil } @@ -223,8 +225,7 @@ func parseSubTypeMessageWithdrawRcv(m *ChatWarsMessage, r *regexp.Regexp) (*Chat cwm := ChatWarsMessageWithdrawRcv{} items := []ChatWarsItems{} re := regexp.MustCompile(`(.*) x (.*)`) - for _, l := range re.FindAllStringSubmatch(m.Text, -1) { - log.Printf("parseSubTypeMessageWithdrawRcv : search : %s x %s\n", l[1], l[2]) + for _, l := range re.FindAllStringSubmatch(r.ReplaceAllString(m.Text, "${Items}"), -1) { i := getObjItemID(``, l[1]) q, _ := strconv.ParseInt(l[2], 10, 64) if i != 0 { @@ -233,7 +234,6 @@ func parseSubTypeMessageWithdrawRcv(m *ChatWarsMessage, r *regexp.Regexp) (*Chat Quantity: q, } items = append(items, item) - log.Printf("parseSubTypeMessageWithdrawRcv : found : %d x %d\n", i, q) } } cwm.ItemList = items diff --git a/workers.go b/workers.go index 5e4fb68..f8d4751 100644 --- a/workers.go +++ b/workers.go @@ -365,7 +365,6 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) { cwm, err := parseSubTypeMessageWithdrawRcv(m, rule.re) logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Parsing objSubTypeMessageWithdrawRcv.") for _, i := range cwm.ItemList { - log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : pushing %d x %d\n", i.ItemID64, i.Quantity) err = insertMsgItem(cwm.Msg.ObjID64, i.ItemID64, i.Quantity) logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Inserting objSubTypeMessageWithdrawRcv.") }