diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/views/scans.py | 12 | ||||
| -rw-r--r-- | core/views/uploads.py | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/core/views/scans.py b/core/views/scans.py index 9bf1edc..4b35377 100644 --- a/core/views/scans.py +++ b/core/views/scans.py @@ -32,6 +32,18 @@ def oldwallet(request, path): message = f'Scan folder error or not found \'{path}\' .' return render(request, 'errors/generic.html', {'message': message}) +def walletindex(request, path): + '''All years: special 'wallet' for scanned index pages + ''' + # print([ s.walletname for s in Wallet.objects.all() ]) + print(f'! - walletindex path:{path}') + try: + wallet = Wallet.objects.get(walletname=urlunquote(path)) + return render(request, 'walletindex.html', { 'wallet':wallet, 'settings': settings }) + except: + message = f'Scan folder error or not found \'{path}\' .' + return render(request, 'errors/generic.html', {'message': message}) + def scansingle(request, path, file): '''sends a single binary file to the user for display - browser decides how using mimetype ''' diff --git a/core/views/uploads.py b/core/views/uploads.py index 7dfa8c1..58b61c2 100644 --- a/core/views/uploads.py +++ b/core/views/uploads.py @@ -26,7 +26,7 @@ from troggle.core.models.troggle import DataIssue from troggle.core.models.troggle import Expedition, Person, PersonExpedition from troggle.core.models.caves import LogbookEntry, QM, Cave, PersonTrip from troggle.core.models.survex import DrawingFile -from troggle.core.views.scans import oldwallet +from troggle.core.views.scans import oldwallet, walletindex from .auth import login_required_if_public #from django.views.decorators.csrf import ensure_csrf_cookie, csrf_exempt @@ -111,8 +111,12 @@ def scanupload(request, path=None): year = wallet[:4] if int(year) <= 1999: - print(f'! - FORM scanupload - start {wallet} REDIRECT TO OLDWALLET') + #print(f'! - FORM scanupload - start {wallet} REDIRECT TO OLDWALLET') return(oldwallet(request, path)) + + if str(wallet).lower().endswith('indexpages'): + print(f'! - FORM scanupload - start {wallet} REDIRECT TO OLDWALLET') + return(walletindex(request, path)) if not re.match('(19|20)\d\d[:#]\d\d', wallet): wallet = "2022:01" # improve this later |