Merge branch 'master' of https://bitbucket.org/kfsone/tradedangerous

eyeonus · Feb 10, 2015 · 11616ea · 11616ea
2 parents 51b6aa8 + 91d3f49
commit 11616ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/cache.py b/cache.py
@@ -219,15 +219,18 @@
     \bSATION\b |
     ,\w |
     \bI?NGLY\b |
-    \bAU\sL[DO0]\b
-    \b[\'\.-]\w |
+    \bAU\sL[DO0]\b |
+    (^|\s)['.-] |
     \bDREBBFL\b
     \bLEVIE |
     \bRN\b |
     \bH\sUNZIKER |
     \bL[O0D]FTH\sUS |
     \bHORNUCH\b |
-    \bKLU\sDZE
+    \bKLU\sDZE |
+    ^[DR]HN\b |
+    SU\sI?RVEY\b |
+    [A-RT-Z]PORT$
 )''', flags=re.X)
 
 
@@ -581,7 +584,7 @@ def changeStation(matches):
                 return
             raise MultipleStationEntriesError(
                         priceFile, lineNo, facility,
-                        processedStations[stationID]
+                        processedStations[newID]
                     )
 
         stationID = newID

diff --git a/corrections.py b/corrections.py
@@ -57,6 +57,8 @@
     "LTT 1349/NORIFRA PORT":                DELETED,
     "OLWAIN/J. G. BALLARD TERMINAL":        DELETED,
     "RAHU/LEBEDEV BEACON":                  DELETED,
+    "ROSMERTA/DHN ORBITAL":                 DELETED,
+    "ROSMERTA/RHN ORBITAL":                 DELETED,
     "TANMARK/CASSI E-L-PEIA":               DELETED,
     "THUNDERBIRD/QUIMPY PORT":              DELETED,
     "VEQUESS/AGNEWS FOLLY":                 "Agnews' Folly",