Merge pull request #749 from gitnnolabs/fix_id_oai

Ajuste o ID para o serviço do OAI.
scieloorg · May 17, 2024 · a3240f1 · a3240f1
2 parents b457c26 + 2a380fc
commit a3240f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/article/search_indexes.py b/article/search_indexes.py
@@ -240,7 +240,8 @@ class ArticleOAIIndex(indexes.SearchIndex, indexes.Indexable):
     The format of the data:
 
         "item.id":1,
-        "item.handle":"oai:redi.anii.org.uy:20.500.12381/2671",
+        "item.handle":"54v7n5FBfdfC3KYFbbGWZYP",
+        "item.id":"54v7n5FBfdfC3KYFbbGWZYP",
         "item.lastmodified":"2022-12-20T15:18:22Z",
         "item.submitter":"submitter",
         "item.deleted":false,
@@ -273,8 +274,8 @@ class ArticleOAIIndex(indexes.SearchIndex, indexes.Indexable):
     """
 
     text = indexes.CharField(document=True, use_template=True)
-    id = indexes.CharField(model_attr="id", index_fieldname="item.handle", null=True)
-    item_id = indexes.CharField(model_attr="id", index_fieldname="item.id", null=True)
+    id = indexes.CharField(index_fieldname="item.handle", null=True)
+    item_id = indexes.CharField(index_fieldname="item.id", null=True)
     updated = indexes.CharField(index_fieldname="item.lastmodified", null=True)
     submitter = indexes.CharField(
         model_attr="creator", index_fieldname="item.submitter", null=True
@@ -302,6 +303,12 @@ class ArticleOAIIndex(indexes.SearchIndex, indexes.Indexable):
         null=True, index_fieldname="item.compile", use_template=True
     )
 
+    def prepare_id(self, obj):
+        return obj.pid_v3 or obj.doi
+
+    def prepare_item_id(self, obj):
+        return obj.pid_v3 or obj.doi
+
     def prepare_doi(self, obj):
         if obj.doi:
             return "".join([doi.value for doi in obj.doi.all()])

diff --git a/index/data/oai/conf/managed-schema.xml b/index/data/oai/conf/managed-schema.xml
@@ -129,7 +129,7 @@
    <field name="django_id" type="string" indexed="false" stored="false" multiValued="false"/>
 
    <!-- Item always present information -->
-   <field name="item.id" type="pint" indexed="true" stored="true" multiValued="false" />
+   <field name="item.id" type="string" indexed="true" stored="true" multiValued="false" />
    <field name="item.public" type="boolean" indexed="true" stored="true" multiValued="false" />
    <field name="item.handle" type="string" indexed="true" stored="true" multiValued="false" />
    <field name="item.collections" type="string" indexed="true" stored="true" multiValued="true" />