diff --git a/server/belga/macros/brief_internal_routing.py b/server/belga/macros/brief_internal_routing.py index 8f5820a7..e31af8e8 100644 --- a/server/belga/macros/brief_internal_routing.py +++ b/server/belga/macros/brief_internal_routing.py @@ -19,7 +19,7 @@ COUNTRY = 'country' PRODUCTS = 'services-products' -BRIEF_SOURCE = BRIEF_CREDIT = 'BELGA/AG' +BRIEF_SOURCE = BRIEF_CREDIT = 'BELGA' DEFAULT_PRODUCT = 'NEWS/GENERAL' PRODUCT_MAPPING = { 'NEWS/SPORTS': ('SPN/', 'SPF/'), diff --git a/server/belga/publish/belga_newsml_1_2.py b/server/belga/publish/belga_newsml_1_2.py index cbd4f02a..25747ca4 100644 --- a/server/belga/publish/belga_newsml_1_2.py +++ b/server/belga/publish/belga_newsml_1_2.py @@ -964,7 +964,10 @@ def _format_newslines(self, newscomponent_2_level, item): # SDBELGA-672 for subject in item.get("subject", []): if subject.get("scheme") == "sources": - SubElement(newslines, "CreditLine").text = subject.get("name") + name = subject.get("name") + if "belga" in name.lower(): # avoid BELGA-AG BELGA/EG etc. should be just BELGA + name = self.DEFAULT_CREDITLINE + SubElement(newslines, "CreditLine").text = name break else: if item.get("source") and item.get("ingest_provider"): diff --git a/server/tests/macros/brief_internal_routing_macro_test.py b/server/tests/macros/brief_internal_routing_macro_test.py index 9ff110a4..035d6873 100644 --- a/server/tests/macros/brief_internal_routing_macro_test.py +++ b/server/tests/macros/brief_internal_routing_macro_test.py @@ -88,13 +88,13 @@ def test_callback(self): self.assertEqual(self.profiles[0], item['profile']) self.assertEqual(2, item['urgency']) self.assertIn({ - 'name': 'BELGA/AG', - 'qcode': 'BELGA/AG', + 'name': 'BELGA', + 'qcode': 'BELGA', 'scheme': 'credits', }, item['subject']) self.assertIn({ - 'name': 'BELGA/AG', - 'qcode': 'BELGA/AG', + 'name': 'BELGA', + 'qcode': 'BELGA', 'scheme': 'sources', }, item['subject'])