From 84fc6345eceadcbb1a7601848b5d554fa1baec13 Mon Sep 17 00:00:00 2001 From: Andrew Iannaccone Date: Fri, 18 Apr 2014 23:41:55 -0700 Subject: [PATCH 1/2] Allow whitespare after rating ranges e.g. parse 5000+, in addition to 5000+ Reorder parsing of ranges like 4000-5000 to before 5000-, as otherwise 4000-5000 will now be interpreted as 4000- --- src/ext/utils.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ext/utils.js b/src/ext/utils.js index 6ff24a8..192a8ac 100644 --- a/src/ext/utils.js +++ b/src/ext/utils.js @@ -128,17 +128,17 @@ GS.parseProRange = function (tablename) { var m, range = {}; - if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\+(?!\S)/)) !== null) { + if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\+/)) !== null) { range.min = GS.parseNum(m[2]); } - if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\-(?!\S)/)) !== null) { - range.max = GS.parseNum(m[2]); - } - if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)-(\d+(.\d+)?([kK])?)(?!\S)/)) !== null) { + if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)-(\d+(.\d+)?([kK])?)/)) !== null) { range.min = GS.parseNum(m[2]); range.max = GS.parseNum(m[5]); } - if ((m = tablename.match(/^(.* |)\+\/\-(\d+(.\d+)?([kK])?)(?!\S)/)) !== null) { + if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\-/)) !== null) { + range.max = GS.parseNum(m[2]); + } + if ((m = tablename.match(/^(.* |)\+\/\-(\d+(.\d+)?([kK])?)/)) !== null) { range.difference = GS.parseNum(m[2]); } return range; From 8590dcb7acca37c4e09c7729b9004c0458fbeb72 Mon Sep 17 00:00:00 2001 From: Andrew Iannaccone Date: Mon, 21 Apr 2014 23:34:21 -0700 Subject: [PATCH 2/2] Fix parsing for autokick by rating. Matches of the form "2000-3000" were being interpreted first in its entirety as a bounded range and then again as "2000-". Now the match checks are in an if-else chain instead, so the first match ends the parsing. --- src/ext/utils.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ext/utils.js b/src/ext/utils.js index 192a8ac..8846a13 100644 --- a/src/ext/utils.js +++ b/src/ext/utils.js @@ -130,15 +130,12 @@ if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\+/)) !== null) { range.min = GS.parseNum(m[2]); - } - if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)-(\d+(.\d+)?([kK])?)/)) !== null) { + } else if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)-(\d+(.\d+)?([kK])?)/)) !== null) { range.min = GS.parseNum(m[2]); range.max = GS.parseNum(m[5]); - } - if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\-/)) !== null) { + } else if ((m = tablename.match(/^(.* |)(\d+(.\d+)?([kK])?)\-/)) !== null) { range.max = GS.parseNum(m[2]); - } - if ((m = tablename.match(/^(.* |)\+\/\-(\d+(.\d+)?([kK])?)/)) !== null) { + } else if ((m = tablename.match(/^(.* |)\+\/\-(\d+(.\d+)?([kK])?)/)) !== null) { range.difference = GS.parseNum(m[2]); } return range;