Changeset 930:6da5e7a7ca9b

Timestamp:

04/27/19 12:21:24 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

More robust NOTAM parsing

File:

• src/mlx/web.py (modified) (3 diffs)

src/mlx/web.py

@@ -15 +15 @@
 import hashlib
 import time
+import re
 import datetime
 import codecs
@@ -578 +579 @@
     def _parseCurrentNOTAM2(self):
         """Parse the current NOTAM with a second, more flexible method."""
+        self._currentNOTAM = self._currentNOTAM.replace("\\n", "\n")
         lines = self._currentNOTAM.splitlines()
+        if len(lines)==1:
+            lines = lines[0].splitlines()
         lines = [line.strip() for line in lines]
 
@@ -614 +618 @@
 
         def parseTime(item):
+            item = re.sub("([0-9]+).*", "\\1", item)
             try:
                 return datetime.datetime.strptime(item, "%y%m%d%H%M")