diff --git a/workers.go b/workers.go index 4806b30..8cb40b4 100644 --- a/workers.go +++ b/workers.go @@ -80,13 +80,15 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) { // r := regexp.MustCompile(`^(?P[.]{1})(?P(\[[A-Z]{3}\]){0,1})(?P([A-Za-z0-9 ]*)) ⚔:(?P[0-9]+) ?:(?P[0-9]+) Lvl: (?P[0-9]+)(?s:.*)$`) // r := regexp.MustCompile(`^(?s:.*)$`) // r := regexp.MustCompile(`^(?P.)(?P(\[[A-Z]{3}\]){0,1})(?P([A-Za-z0-9 ]*))(?s:.*)$`) - r := regexp.MustCompile(`^(?P.)(?P(\[[A-Z]{3}\]){0,1})(?P([A-Za-z0-9 ]*)) ⚔:(?P[0-9]+)(?s:.*)$`) + // r := regexp.MustCompile(`^(?P.)(?P(\[[A-Z]{3}\]){0,1})(?P([A-Za-z0-9 ]*)) ⚔:(?P[0-9]+)(?s:.*)$`) + r := regexp.MustCompile(`^(?P.)(?P(\[[A-Z]{3}\]){0,1})(?P([A-Za-z0-9 ]*)) ⚔:(?P[0-9]+) ?:(?P[0-9]+)(?s:.*)$`) if r.FindStringSubmatch(m.Text) != nil { log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : War report identified (%d)\n", objId) log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Castle : %s (%d)\n", r.ReplaceAllString(m.Text, "${Castle}"), objId) log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Guild : %s (%d)\n", r.ReplaceAllString(m.Text, "${Guild}"), objId) log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : User : %s (%d)\n", r.ReplaceAllString(m.Text, "${User}"), objId) log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Attack : %s (%d)\n", r.ReplaceAllString(m.Text, "${Attack}"), objId) + log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Defense : %s (%d)\n", r.ReplaceAllString(m.Text, "${Defense}"), objId) } else { log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Unknown message type (%d)\n", objId) }