Merge branch 'master' into work

bireme · Mar 27, 2019 · c702ca3 · c702ca3
2 parents 04b38ef + 12df7c9
commit c702ca3
Show file tree

Hide file tree

Showing 11 changed files with 277 additions and 244 deletions.
diff --git a/bireme/biblioref/forms.py b/bireme/biblioref/forms.py
@@ -931,32 +931,6 @@ def save(self, *args, **kwargs):
         # save object
         obj.save()
 
-        # update DeDup service
-        if self.document_type == 'Sas':
-            # for status LLXP and Published use more complete schema of DeDup index
-            if obj.status == 0 or obj.status == 1:
-                dedup_schema = 'LILACS_Sas_Seven'
-                author_list = [au.get('text') for au in obj.individual_author] if obj.individual_author else []
-                first_page = obj.pages[0].get('_f', '') if obj.pages else ''
-                dedup_params = {"ano_publicacao": obj.source.publication_date_normalized[:4],
-                                "numero_fasciculo": obj.source.issue_number, "volume_fasciculo": obj.source.volume_serial,
-                                "titulo_artigo": obj.title[0]['text'], "titulo_revista": obj.source.title_serial,
-                                "autores": '//@//'.join(author_list), "pagina_inicial": first_page}
-            else:
-                dedup_schema = 'LILACS_Sas_Five'
-                dedup_params = {"ano_publicacao": obj.source.publication_date_normalized[:4],
-                                "numero_fasciculo": obj.source.issue_number, "volume_fasciculo": obj.source.volume_serial,
-                                "titulo_artigo": obj.title[0]['text'], "titulo_revista": obj.source.title_serial}
-
-            json_data = json.dumps(dedup_params, ensure_ascii=True)
-            dedup_headers = {'Content-Type': 'application/json'}
-            ref_id = "fiadmin-{0}".format(obj.id)
-            dedup_url = "{0}/{1}/{2}/{3}".format(settings.DEDUP_PUT_URL, 'lilacs_Sas', dedup_schema, ref_id)
-            try:
-                dedup_request = requests.post(dedup_url, headers=dedup_headers, data=json_data, timeout=5)
-            except:
-                pass
-
         return obj
 
 class BiblioRefSourceForm(BiblioRefForm):

diff --git a/bireme/biblioref/views.py b/bireme/biblioref/views.py
@@ -250,6 +250,8 @@ def form_valid(self, form):
                 form.save_m2m()
                 # update solr index
                 form.save()
+                # update DeDup service
+                update_dedup_service(self.object)
 
                 return HttpResponseRedirect(self.get_success_url())
         else:
@@ -634,3 +636,35 @@ def refs_llxp_for_indexing(current_user):
     ref_list = ref_list.filter(filter_title_qs)
 
     return ref_list
+
+
+# update DeDup service
+def update_dedup_service(obj):
+    if obj.document_type() == 'Sas':
+        # send multiple DeDup entries with the same ID for each title #728
+        for article_title in obj.title:
+            # for status LLXP and Published use more complete schema of DeDup index
+            if obj.status == 0 or obj.status == 1:
+                dedup_schema = 'LILACS_Sas_Seven'
+                author_list = [au.get('text') for au in obj.individual_author] if obj.individual_author else []
+                first_page = obj.pages[0].get('_f', '') if obj.pages else ''
+                dedup_params = {"ano_publicacao": obj.source.publication_date_normalized[:4],
+                                "numero_fasciculo": obj.source.issue_number, "volume_fasciculo": obj.source.volume_serial,
+                                "titulo_artigo": article_title['text'], "titulo_revista": obj.source.title_serial,
+                                "autores": '//@//'.join(author_list), "pagina_inicial": first_page}
+            else:
+                dedup_schema = 'LILACS_Sas_Five'
+                dedup_params = {"ano_publicacao": obj.source.publication_date_normalized[:4],
+                                "numero_fasciculo": obj.source.issue_number, "volume_fasciculo": obj.source.volume_serial,
+                                "titulo_artigo": article_title['text'], "titulo_revista": obj.source.title_serial}
+
+            json_data = json.dumps(dedup_params, ensure_ascii=True)
+            dedup_headers = {'Content-Type': 'application/json'}
+            # send to DeDup FIADMIN ID with title language code. Ex. fiadmin-99999-pt #728
+            ref_id = "fiadmin-{0}-{1}".format(obj.id, article_title['_i'])
+
+            dedup_url = "{0}/{1}/{2}/{3}".format(settings.DEDUP_PUT_URL, 'lilacs_Sas', dedup_schema, ref_id)
+            try:
+                dedup_request = requests.post(dedup_url, headers=dedup_headers, data=json_data, timeout=5)
+            except:
+                pass
diff --git a/bireme/events/views.py b/bireme/events/views.py
@@ -167,8 +167,6 @@ def create_edit_event(request, **kwargs):
 
             # update solr index
             form.save()
-            # update solr index
-            form.save_m2m()
 
             output['alert'] = _("Event successfully edited.")
             output['alerttype'] = "alert-success"

diff --git a/bireme/locale/es/LC_MESSAGES/django.mo b/bireme/locale/es/LC_MESSAGES/django.mo