From d6268acc60456a8b4e2947553528efc3f328e62d Mon Sep 17 00:00:00 2001 From: shoopea Date: Sun, 19 May 2019 11:12:07 +0800 Subject: [PATCH] test --- job.go | 2 +- utils.go | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/job.go b/job.go index eef2fe5..85da80a 100644 --- a/job.go +++ b/job.go @@ -20,7 +20,7 @@ func jobRescan(j Job) { if len(ids) > 1 { for i := 1; i <= (len(ids)/SQLMsgRescanJobSize)+1; i++ { var s string - for _, id := range ids[((i - 1) * SQLMsgRescanJobSize):(i*SQLMsgRescanJobSize - 1)] { + for _, id := range ids[((i - 1) * SQLMsgRescanJobSize) : Min((i*SQLMsgRescanJobSize), len(ids))-1] { s = s + fmt.Sprintf("SELECT %d id FROM DUAL UNION\n", id) } s = s + `SELECT 0 id FROM DUAL WHERE 1 = 2;` diff --git a/utils.go b/utils.go index dbcdaca..4a1414a 100644 --- a/utils.go +++ b/utils.go @@ -20,6 +20,22 @@ func logOnError(err error, msg string) { } } +func Min(int a, int b) int { + if a < b { + return a + } else { + return b + } +} + +func Max(int a, int b) int { + if a > b { + return a + } else { + return b + } +} + func fromChatWarsDate(d string) (t time.Time, err error) { r := regexp.MustCompile(`(?P[0-9]{2}) (?P(Wintar|Hornung|Lenzin|Ōstar|Winni|Brāh|Hewi|Aran|Witu|Wīndume|Herbist|Hailag)) (?P[0-9]{4})( (?P[0-9]{2}):(?P[0-9]{2})){0,1}`) if r.FindStringSubmatch(d) != nil {