|
|
@@ -505,6 +505,7 @@ class BatcaveHttpRequestHandler(BaseHTTPRequestHandler):
|
|
|
# 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()
|
|
|
|
|
|
+ isp = str(isp)
|
|
|
if not isp in ispblocks:
|
|
|
ispblocks[isp] = set()
|
|
|
ispblocks[isp].add(ispblock)
|
|
|
@@ -550,7 +551,7 @@ class BatcaveHttpRequestHandler(BaseHTTPRequestHandler):
|
|
|
isps[isp],
|
|
|
isps[isp]*100.0/isps_sum,
|
|
|
isp,
|
|
|
- ', '.join(sorted(ispblocks[isp])),
|
|
|
+ ', '.join(sorted(ispblocks[isp])) if isp in ispblocks else '?',
|
|
|
))
|
|
|
|
|
|
self.wfile.write('</tbody></table>\n')
|
