From 37a7f5751cea06306d8a564d23aac755de84d641 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Sun, 20 Nov 2016 14:15:36 +0100
Subject: [PATCH] Clean urls, work on metadata upload bug
---
journals/views.py | 30 +++++++++++++++++-------------
scipost/urls.py | 12 +++++++++---
2 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/journals/views.py b/journals/views.py
index 2e8d6167b..fe686b928 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -162,14 +162,6 @@ def scipost_physics_issue_detail(request, volume_nr, issue_nr):
return render(request, 'journals/scipost_physics_issue_detail.html', context)
-def upload_proofs(request):
- """
- TODO
- Called by a member of the Production Team.
- Upload the production version .pdf of a submission.
- """
- return render(request, 'journals/upload_proofs.html')
-
#######################
# Publication process #
@@ -185,6 +177,13 @@ def upload_proofs(request):
# context = {'accepted_submissions': accepted_submissions,}
# return render(request, 'journals/publishing_workspace.html', context)
+def upload_proofs(request):
+ """
+ TODO
+ Called by a member of the Production Team.
+ Upload the production version .pdf of a submission.
+ """
+ return render(request, 'journals/upload_proofs.html')
@permission_required('scipost.can_publish_accepted_submission', return_403=True)
@transaction.atomic
@@ -548,16 +547,18 @@ def test_metadata_xml_deposit(request, doi_string):
r = requests.post(url,
params=params,
files=files,
- #verify=settings.CERTFILE
+ verify=settings.CERTFILE,
)
#s = requests.Session()
#s.mount('https://', MyAdapter())
#r = s.post(url, params=params, files=files)
response_headers = r.headers
response_text = r.text
- context = {'response_headers': response_headers,
- 'response_text': response_text,}
- return render(requests, 'journals/test_metadata_xml_deposit.html', context)
+ context = {'publication': publication,
+ 'response_headers': response_headers,
+ 'response_text': response_text,
+ }
+ return render(request, 'journals/test_metadata_xml_deposit.html', context)
@@ -579,7 +580,8 @@ def publication_pdf(request, doi_string):
+ publication.doi_label.replace('.', '_') + '.pdf')
return response
-def publication_detail_form_doi_label(request, doi_label):
+
+def publication_detail_from_doi_label(request, doi_label):
publication = get_object_or_404 (Publication, doi_label=doi_label)
context = {'publication': publication,}
return render(request, 'journals/publication_detail.html', context)
@@ -592,3 +594,5 @@ def publication_pdf_from_doi_label(request, doi_label):
response['Content-Disposition'] = ('filename='
+ publication.doi_label.replace('.', '_') + '.pdf')
return response
+
+
diff --git a/scipost/urls.py b/scipost/urls.py
index 1ae7c4eee..97bebb6a4 100644
--- a/scipost/urls.py
+++ b/scipost/urls.py
@@ -137,12 +137,18 @@ urlpatterns = [
# Publications #
################
- url(r'^10.21468/SciPostPhys$',
+ url(r'^SciPostPhys$',
journals_views.scipost_physics,
name='SciPostPhys'),
- url(r'^10.21468/SciPostPhys.(?P<volume_nr>[0-9]+).(?P<issue_nr>[0-9]+)$',
+ url(r'^10.21468/SciPostPhys$',
+ journals_views.scipost_physics,
+ name='doi_SciPostPhys'),
+ url(r'^SciPostPhys.(?P<volume_nr>[0-9]+).(?P<issue_nr>[0-9]+)$',
journals_views.scipost_physics_issue_detail,
name='SciPostPhys_issue_detail'),
+ url(r'^10.21468/SciPostPhys.(?P<volume_nr>[0-9]+).(?P<issue_nr>[0-9]+)$',
+ journals_views.scipost_physics_issue_detail,
+ name='doi_SciPostPhys_issue_detail'),
url(r'^(?P<doi_string>10.21468/[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
journals_views.publication_detail,
@@ -151,7 +157,7 @@ urlpatterns = [
journals_views.publication_pdf,
name='publication_pdf'),
url(r'^(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})$',
- journals_views.publication_detail_form_doi_label,
+ journals_views.publication_detail_from_doi_label,
name='publication_detail_from_doi_label'),
url(r'^(?P<doi_label>[a-zA-Z]+.[0-9]+.[0-9]+.[0-9]{3,})/pdf$',
journals_views.publication_pdf_from_doi_label,
--
GitLab