Skip to content

Commit 0bdfd01

Browse files
committed
remove base publisher document
1 parent 76dd033 commit 0bdfd01

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

DataSpace/settings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@
280280
"search.documents.collaborative_document": "collaborative",
281281
"search.documents.publisher_document.OrganizationPublisherDocument": "organization_publisher",
282282
"search.documents.publisher_document.UserPublisherDocument": "user_publisher",
283-
"search.documents.publisher_document": "publisher",
284283
}
285284

286285

search/documents/publisher_document.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
from DataSpace import settings
99
from search.documents.analysers import html_strip, ngram_analyser
1010

11-
INDEX = Index(settings.ELASTICSEARCH_INDEX_NAMES[__name__])
12-
INDEX.settings(number_of_shards=1, number_of_replicas=0)
13-
1411

1512
class PublisherDocument(Document):
1613
"""Elasticsearch document for Publisher (Organization and User) models."""
@@ -321,10 +318,13 @@ def get_instances_from_related(
321318
return publishers if publishers else None
322319

323320

324-
@INDEX.doc_type
325321
class OrganizationPublisherDocument(PublisherDocument):
326322
"""Organization-specific publisher document."""
327323

324+
class Index:
325+
name = settings.ELASTICSEARCH_INDEX_NAMES[f"{__name__}.OrganizationPublisherDocument"]
326+
settings = {"number_of_shards": 1, "number_of_replicas": 0}
327+
328328
class Django:
329329
"""Django model configuration."""
330330

@@ -343,10 +343,13 @@ class Django:
343343
]
344344

345345

346-
@INDEX.doc_type
347346
class UserPublisherDocument(PublisherDocument):
348347
"""User-specific publisher document."""
349348

349+
class Index:
350+
name = settings.ELASTICSEARCH_INDEX_NAMES[f"{__name__}.UserPublisherDocument"]
351+
settings = {"number_of_shards": 1, "number_of_replicas": 0}
352+
350353
class Django:
351354
"""Django model configuration."""
352355

0 commit comments

Comments
 (0)