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