diff options
| author | Freeyorp <TheFreeYorp@NOSPAM.G.m.a.i.l.replace> | 2013-10-02 14:12:45 +1300 |
|---|---|---|
| committer | Freeyorp <TheFreeYorp@NOSPAM.G.m.a.i.l.replace> | 2013-10-02 14:12:45 +1300 |
| commit | f6b9c8d03866575bd0e0e1c21c08f0cb8b2628ac (patch) | |
| tree | cdd5c26ddd0c41d583f522bbba5caa08d94b746d | |
| parent | 97cbd37944e907a29a0ff6342cfce3a95fa8945c (diff) | |
| download | manavis-f6b9c8d03866575bd0e0e1c21c08f0cb8b2628ac.tar.gz manavis-f6b9c8d03866575bd0e0e1c21c08f0cb8b2628ac.tar.bz2 manavis-f6b9c8d03866575bd0e0e1c21c08f0cb8b2628ac.tar.xz manavis-f6b9c8d03866575bd0e0e1c21c08f0cb8b2628ac.zip | |
Parse new timestamp format in backwards compatible way
| -rw-r--r-- | public/js/mv/parse.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/public/js/mv/parse.js b/public/js/mv/parse.js index 6afe96a..7ce8be9 100644 --- a/public/js/mv/parse.js +++ b/public/js/mv/parse.js @@ -64,7 +64,7 @@ var mv = function(mv) { }; function checkXP(e) { /* Try to parse an XP record. */ - var d = e.match(/^(\d+\.\d+) PC(\d+) ([^,]+):(\d+),(\d+) GAINXP (\d+) (\d+) (\w+)/);; + var d = e.match(/^(\d+\.\d+|\d+-\d+-\d+ \d+:\d+:\d+\.\d+):? PC(\d+) ([^,]+):(\d+),(\d+) GAINXP (\d+) (\d+) (\w+)/);; if (!d) { return false; } @@ -73,7 +73,7 @@ var mv = function(mv) { var mapSID = parseInt(d[3]); /* Record timestamp. */ var ts = new Date(0); - ts.setUTCSeconds(d[1]); + ts.setUTCSeconds(d[1]) || (ts = new Date(d[1])); /* Backwards compatability - older logs used unix timestamps. */ var rec = { date: ts, pc: parseInt(d[2]), @@ -148,7 +148,7 @@ var mv = function(mv) { return true; } function checkDmg(e) { - var d = e.match(/^(\d+\.\d+) PC(\d+) ([^,]+):(\d+),(\d+) ([A-Z]+)DMG MOB(\d+) (\d+) FOR (\d+) (?:WPN|BY) ([^ ]+)/); + var d = e.match(/^(\d+\.\d+|\d+-\d+-\d+ \d+:\d+:\d+\.\d+):? PC(\d+) ([^,]+):(\d+),(\d+) ([A-Z]+)DMG MOB(\d+) (\d+) FOR (\d+) (?:WPN|BY) ([^ ]+)/); if (!d) { return false; } @@ -162,7 +162,7 @@ var mv = function(mv) { return true; } function checkMobMobDmg(e) { - var d = e.match(/^^(\d+\.\d+) PC(\d+) ([^,]+):(\d+),(\d+) MOB-TO-MOB-DMG FROM MOB(\d+) (\d+) TO MOB(\d+) (\d+) FOR (\d+)/); + var d = e.match(/^(\d+\.\d+|\d+-\d+-\d+ \d+:\d+:\d+\.\d+):? PC(\d+) ([^,]+):(\d+),(\d+) MOB-TO-MOB-DMG FROM MOB(\d+) (\d+) TO MOB(\d+) (\d+) FOR (\d+)/); if (!d) { return false; } @@ -177,7 +177,7 @@ var mv = function(mv) { return true; } function checkMobDeath(e) { - var d = e.match(/^(\d+\.\d+) MOB(\d+) DEAD/); + var d = e.match(/^(\d+\.\d+|\d+-\d+-\d+ \d+:\d+:\d+\.\d+):? MOB(\d+) DEAD/); if (!d) { return false; } |