mirror of
https://github.com/MISP/misp-galaxy.git
synced 2024-11-26 08:47:18 +00:00
Fix [cluster] duplicates
This commit is contained in:
parent
86f3ada396
commit
65470855b3
2 changed files with 12 additions and 8 deletions
|
@ -442,8 +442,8 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"related": [],
|
"related": [],
|
||||||
"uuid": "7ee96458-af7b-423e-8300-002a7389e934",
|
"uuid": "e9ae0f01-4042-4cea-abfd-2fa2c7ed6a5b",
|
||||||
"value": "Special Branch"
|
"value": "Special Branch (Bahamas)"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Financial Intelligence Unit (FIU)",
|
"description": "Financial Intelligence Unit (FIU)",
|
||||||
|
@ -455,8 +455,8 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"related": [],
|
"related": [],
|
||||||
"uuid": "23a169a2-c94c-433e-98ba-4d0bb65d99a4",
|
"uuid": "75f6a4ce-7654-40e9-9e8e-8a63dcb46804",
|
||||||
"value": "Financial Intelligence Unit"
|
"value": "Financial Intelligence Unit (Bahamas)"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "NSA – National Security Agency",
|
"description": "NSA – National Security Agency",
|
||||||
|
@ -689,8 +689,8 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"related": [],
|
"related": [],
|
||||||
"uuid": "23a169a2-c94c-433e-98ba-4d0bb65d99a4",
|
"uuid": "9c5f95f2-2fd3-4d9b-9863-03117fe8b249",
|
||||||
"value": "Financial Intelligence Unit"
|
"value": "Financial Intelligence Unit (Barbados)"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Criminal Investigations Department (CID)",
|
"description": "Criminal Investigations Department (CID)",
|
||||||
|
@ -4418,8 +4418,8 @@
|
||||||
"country_name": "Sri Lanka"
|
"country_name": "Sri Lanka"
|
||||||
},
|
},
|
||||||
"related": [],
|
"related": [],
|
||||||
"uuid": "7ee96458-af7b-423e-8300-002a7389e934",
|
"uuid": "f134c0bd-7ff1-43fc-a128-13459623efb0",
|
||||||
"value": "Special Branch"
|
"value": "Special Branch (Sri Lanka)"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "Terrorist Investigation Division",
|
"description": "Terrorist Investigation Division",
|
||||||
|
|
|
@ -121,6 +121,10 @@ def get_agencies_from_country(heading, current_country, uuids):
|
||||||
if current_country in ["European Union", "Shanghai Cooperation Organisation"]: # Not a country
|
if current_country in ["European Union", "Shanghai Cooperation Organisation"]: # Not a country
|
||||||
country_name = None
|
country_name = None
|
||||||
|
|
||||||
|
# Set names for duplicates
|
||||||
|
if name in ['Special Branch', 'Financial Intelligence Unit']:
|
||||||
|
name = f'{name} ({current_country})'
|
||||||
|
|
||||||
if uuids and name in uuids:
|
if uuids and name in uuids:
|
||||||
agencies.append(IntelAgency(value=name, uuid=uuids[name], meta=Meta(country=country_code, country_name=country_name, refs=[links], synonyms=synonyms), description=description))
|
agencies.append(IntelAgency(value=name, uuid=uuids[name], meta=Meta(country=country_code, country_name=country_name, refs=[links], synonyms=synonyms), description=description))
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue