fix regex issues

classes.py

@@ -219,7 +219,8 @@ class ETSISpecFinder:
             except (ValueError, IndexError):
                 return []
 
-        def fetch_for_type(spec_type):
+        def fetch_candidates():
+            spec_num = doc_id.split("-")[0].replace(" ", "")
             params = {
                 "view": "data",
                 "format": "json",
@@ -232,15 +233,16 @@ class ETSISpecFinder:
                                     proxies=_get_proxies())
                 data = resp.json()
                 if data and isinstance(data, list):
-                    return [str(item["wki_id"]) for item in data if "wki_id" in item]
+                    return [
+                        str(item["wki_id"])
+                        for item in data
+                        if "wki_id" in item and spec_num in json.dumps(item)
+                    ]
             except Exception as e:
                 print(f"Error getting wki_id for {doc_id}: {e}")
             return []
 
-        candidates = []
-        with ThreadPoolExecutor(max_workers=2) as executor:
-            for result in executor.map(fetch_for_type, ["TS", "TR"]):
-                candidates.extend(result)
+        candidates = list(dict.fromkeys(fetch_candidates()))  # single call, deduped
         return candidates
 
     def _authenticate_eol(self, wki_id: str) -> requests.Session:
@@ -341,11 +343,16 @@ class ETSISpecFinder:
             print(f"  wki_id={wki_id}: success")
             return tmp_path
 
-        with ThreadPoolExecutor(max_workers=min(len(candidates), 4)) as executor:
-            future_to_wki = {executor.submit(try_wki, wki_id): wki_id for wki_id in candidates}
-            for future in as_completed(future_to_wki):
+        executor = ThreadPoolExecutor(max_workers=min(len(candidates), 4))
+        try:
+            futures = {executor.submit(try_wki, wki_id): wki_id for wki_id in candidates}
+            for future in as_completed(futures):
                 result = future.result()
                 if result is not None:
+                    for f in futures:
+                        f.cancel()
                     return result
+        finally:
+            executor.shutdown(wait=False)
 
-        return f"Specification {doc_id}: all {len(candidates)} wki_id candidate(s) rejected by ETSI portal"
+        return f"Specification {doc_id}: all {len(candidates)} wki_id candidate(s) rejected"