|
|
@@ -498,7 +498,8 @@ class BatcaveHttpRequestHandler(BaseHTTPRequestHandler):
|
|
|
isp = re.sub(r'(dynamic )?(customer |subscriber )?(ip )?(pool|(address )?range|addresses)$', '', isp, flags=re.IGNORECASE).strip()
|
|
|
|
|
|
# normalize name: strip "B2B" and aggregation suffixes
|
|
|
- isp = re.sub(r'(B2B )?(aggregate|aggregation)?$', '', isp, flags=re.IGNORECASE).strip()
|
|
|
+ isp = re.sub(r'(aggregate|aggregation)?$', '', isp, flags=re.IGNORECASE).strip()
|
|
|
+ isp = re.sub(r'(B2B)?$', '', isp, flags=re.IGNORECASE).strip()
|
|
|
|
|
|
# normalize name: strip country suffixes (in Germany)
|
|
|
isp = re.sub(r'(DE|Deutschland|Germany|Nordrhein[- ]Westfalen|NRW|Baden[- ]Wuerttemburg|BW|Hessen|Niedersachsen|Rheinland[- ]Pfalz|RLP)$', '', isp, flags=re.IGNORECASE).strip()
|
