fix etsi search ts issue

classes.py

@@ -202,22 +202,22 @@ class ETSISpecFinder:
 
         return f"Specification {doc_id} not found"
 
-    def _get_wki_id_candidates(self, doc_id: str, version: str = None) -> list:
-        """Return a list of candidate wki_ids for a spec version (best match first)."""
+    def _get_wki_id_candidates(self, doc_id: str, version: str = None) -> tuple:
+        """Return (candidates, version_str) for a spec version (best match first)."""
         if version:
             version_str = version
         else:
             # Derive version from the FTP PDF URL
             pdf_url = self.search_document(doc_id)
             if "not found" in pdf_url.lower():
-                return []
+                return [], ""
             parts = pdf_url.rstrip("/").split("/")
             version_folder = parts[-2]          # e.g. "18.04.00_60"
             v_parts = version_folder.split("_")[0].split(".")  # ["18", "04", "00"]
             try:
                 version_str = f"{int(v_parts[0])}.{int(v_parts[1])}.{int(v_parts[2])}"
             except (ValueError, IndexError):
-                return []
+                return [], ""
 
         def fetch_candidates():
             spec_num = doc_id.split("-")[0].replace(" ", "")
@@ -243,7 +243,7 @@ class ETSISpecFinder:
             return []
 
         candidates = list(dict.fromkeys(fetch_candidates()))  # single call, deduped
-        return candidates
+        return candidates, version_str
 
     def _authenticate_eol(self, wki_id: str) -> requests.Session:
         """Create a requests.Session authenticated to the ETSI EOL portal."""
@@ -274,10 +274,16 @@ class ETSISpecFinder:
 
     def search_document_docx(self, doc_id: str, version: str = None) -> str:
         """Download an ETSI spec as DOCX and return the local file path."""
-        candidates = self._get_wki_id_candidates(doc_id, version)
+        candidates, version_str = self._get_wki_id_candidates(doc_id, version)
         if not candidates:
             return f"Specification {doc_id} not found"
 
+        # Build zero-padded version tag for filename matching, e.g. "1.2.1" -> "010201"
+        try:
+            version_tag = "".join(f"{int(p):02d}" for p in version_str.split("."))
+        except (ValueError, AttributeError):
+            version_tag = ""
+
         # Authenticate once — cookies are auth tokens, not wki_id-specific
         auth_session = self._authenticate_eol(candidates[0])
 
@@ -333,6 +339,14 @@ class ETSISpecFinder:
                 print(f"  wki_id={wki_id}: DOCX spec mismatch (expected {spec_num}), trying next")
                 return None
 
+            if version_tag:
+                versioned_urls = [u for u in matching_urls if version_tag in u.split("/")[-1]]
+                if not versioned_urls:
+                    found_names = [u.split("/")[-1] for u in matching_urls]
+                    print(f"  wki_id={wki_id}: DOCX version mismatch (expected {version_str} / tag {version_tag}, got {found_names}), trying next")
+                    return None
+                matching_urls = versioned_urls
+
             docx_url = matching_urls[0]
             dl = session.get(docx_url, headers={"Referer": r4.url}, verify=False, timeout=60)
             filename = docx_url.split("/")[-1]