Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.0
1.9.1
20 changes: 18 additions & 2 deletions article/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,24 @@ def __str__(self):

@classmethod
def metadata(cls, collection=None):
objs = cls.objects.all() if not collection else cls.objects.filter(collection=collection)
for a in objs:
qs = cls.objects.select_related('collection').only(
'collection__acron3',
'default_lang',
'files',
'pid_v2',
'pid_v3',
'pid_generic',
'processing_date',
'publication_date',
'publication_year',
'scielo_issn',
'text_langs',
)

if collection:
qs = qs.filter(collection=collection)

for a in qs.iterator():
yield {
'collection': a.collection.acron3,
'default_lang': a.default_lang,
Expand Down
26 changes: 16 additions & 10 deletions journal/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,23 @@ def __str__(self):

@classmethod
def metadata(cls, collection=None):
objs = cls.objects.all() if not collection else cls.objects.filter(collection=collection)
for j in objs:
queryset = cls.objects.all()
if collection:
queryset = queryset.filter(collection=collection)

for journal in queryset.only(
'acronym', 'collection__acron3', 'issns', 'publisher_name',
'scielo_issn', 'subject_areas', 'title', 'wos_subject_areas'
):
yield {
'acronym': j.acronym,
'collection': j.collection.acron3,
'issns': j.issns,
'publisher_name': j.publisher_name,
'scielo_issn': j.scielo_issn,
'subject_areas': j.subject_areas,
'title': j.title,
'wos_subject_areas': j.wos_subject_areas,
'acronym': journal.acronym,
'collection': journal.collection.acron3,
'issns': set([v for v in journal.issns.values() if v]),
'publisher_name': journal.publisher_name,
'scielo_issn': journal.scielo_issn,
'subject_areas': journal.subject_areas,
'title': journal.title,
'wos_subject_areas': journal.wos_subject_areas,
}

class Meta:
Expand Down