|
11 | 11 | from core import files |
12 | 12 |
|
13 | 13 |
|
14 | | -def prepare_temp_folder(request=None, issue=None, article=None, loc_code=None): |
| 14 | +def prepare_temp_folder(request=None, issue=None, article=None, loc_code=None, journal_code=None): |
15 | 15 | """ |
16 | | - Perpares a temp folder to store files for zipping |
| 16 | + Prepares a temp folder to store files for zipping |
17 | 17 | :param request: Request object |
18 | 18 | :param issue: Issue Object |
19 | 19 | :param article: Article object |
20 | 20 | :param loc_code: string |
| 21 | + :param journal_code: string |
21 | 22 | :return: Folder path, string |
22 | 23 | """ |
23 | 24 | folder_string = str(uuid.uuid4()) |
| 25 | + request_journal_code = getattr(getattr(request, "journal", None), "code", None) |
24 | 26 |
|
25 | | - if article and issue and request: |
| 27 | + if journal_code is None and request_journal_code: |
| 28 | + journal_code = request_journal_code |
| 29 | + |
| 30 | + if article and issue and journal_code: |
26 | 31 | folder_string = '{journal_code}_{vol}_{issue}_{pk}'.format( |
27 | | - journal_code=request.journal.code, |
| 32 | + journal_code=journal_code, |
28 | 33 | vol=issue.volume, |
29 | 34 | issue=issue.issue, |
30 | 35 | pk=article.pk) |
31 | | - elif issue and request: |
| 36 | + elif issue and journal_code: |
32 | 37 | folder_string = '{journal_code}_{vol}_{issue}_{year}'.format( |
33 | | - journal_code=request.journal.code, |
| 38 | + journal_code=journal_code, |
34 | 39 | vol=issue.volume, |
35 | 40 | issue=issue.issue, |
36 | 41 | year=issue.date.year) |
37 | | - elif article and request: |
| 42 | + elif article and journal_code: |
38 | 43 | folder_string = '{journal_code}_{article_id}'.format( |
39 | | - journal_code=request.journal.code, |
| 44 | + journal_code=journal_code, |
40 | 45 | article_id=article.pk) |
41 | 46 | elif loc_code: |
42 | 47 | folder_string = loc_code |
|
0 commit comments