Merge pull request #677 from OP-TED/feature/TEDEFO-2646-patch-EFX-for…

…-TEDWEB-multi-language-fields TEDEFO-2646 in EFX for multi-lingual fields add a special condition b…
OP-TED · Sep 21, 2023 · 9c6db79 · 9c6db79
2 parents 0ca2502 + 2ea1185
commit 9c6db79
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.ted/tedweb/report-metadata.json b/.ted/tedweb/report-metadata.json
@@ -1,22 +1,22 @@
 {
 	"CA": {
-		"efx": "{ND-Root} ${/BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-Buyer]}",
+		"efx": "{ND-Root} ${/BT-500-Organization-Company[(BT-500-Organization-Company/@languageID is not empty) and (OPT-200-Organization-Company == OPT-300-Procedure-Buyer)]}",
 		"comment": "Buyer name"
 	},
 	"CN": {
 		"efx": "{ND-Root, text:$vRES} ${/BT-150-Contract[OPT-316-Contract == OPT-315-LotResult[BT-13713-LotResult == '$vRES']]}",
 		"comment": "List of 'Contract Identifier' of the result of a specific Result"
 	},
 	"CT": {
-		"efx": "{ND-Root, text:$vRES} ${/BT-721-Contract[OPT-316-Contract == OPT-315-LotResult [BT-13713-LotResult == '$vRES']]}",
+		"efx": "{ND-Root, text:$vRES} ${/BT-721-Contract[(BT-721-Contract/@languageID is not empty) and (OPT-316-Contract == OPT-315-LotResult [BT-13713-LotResult == '$vRES'])]}",
 		"comment": "List of 'name of Contract' of the result of a specific result"
 	},
 	"Con_award_list": {
 		"efx": "{ND-Root, text:$vRES} ${/OPT-310-Tender[(OPT-321-Tender == OPT-320-LotResult[BT-13713-LotResult == '$vRES']) and (OPT-321-Tender == BT-3202-Contract)]}",
 		"comment": "Tendering Party ID Reference of a specific result"
 	},
 	"Con_award_names": {
-		"efx": "{ND-Root, text:$vTPA} ${/BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == '$vTPA']]}",
+		"efx": "{ND-Root, text:$vTPA} ${/BT-500-Organization-Company[(BT-500-Organization-Company/@languageID is not empty) and (OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == '$vTPA'])]}",
 		"comment": "Contractor awarded (winning tenderer)"
 	},
 	"Currency": {
@@ -60,7 +60,7 @@
 		"comment": "Procedure Type"
 	},
 	"TN": {
-		"efx": "{ND-Root}  ${/BT-21-Procedure}",
+		"efx": "{ND-Root}  ${/BT-21-Procedure[BT-21-Procedure/@languageID is not empty]}",
 		"comment": "Procurement title"
 	},
 	"NoticePublicationID": {

diff --git a/.ted/tedweb/search-metadata.json b/.ted/tedweb/search-metadata.json
@@ -132,7 +132,7 @@
 		"comment": "Languages in which tenders may be submitted"
 	},
 	"TI-Title": {
-		"efx": "{ND-Root} ${/BT-21-Procedure}",
+		"efx": "{ND-Root} ${/BT-21-Procedure[BT-21-Procedure/@languageID is not empty]}",
 		"comment": "(TI) Title (Title of the document)"
 	},
 	"TI-CPV": {