diff --git a/commentaries/forms.py b/commentaries/forms.py
index 25fa917eb54362c6c919950f262503d74d781cb2..2a3e7339914a13646be9882aeb5df93c9d592ae6 100644
--- a/commentaries/forms.py
+++ b/commentaries/forms.py
@@ -13,12 +13,17 @@ COMMENTARY_REFUSAL_CHOICES = (
(0, '-'),
(-1, 'a commentary on this paper already exists'),
(-2, 'this paper cannot be traced'),
- (-3, 'this arXiv preprint is too recent (< 8 weeks)'),
+ (-3, 'there exists a more revent version of this arXiv preprint'),
)
+commentary_refusal_dict = dict(COMMENTARY_REFUSAL_CHOICES)
class DOIToQueryForm(forms.Form):
doi = forms.CharField(widget=forms.TextInput({'label': 'DOI', 'placeholder': 'ex.: 10.21468/00.000.000000'}))
+class IdentifierToQueryForm(forms.Form):
+ identifier = forms.CharField(widget=forms.TextInput({'label': 'arXiv identifier',
+ 'placeholder': 'new style ####.####(#)v# or old-style e.g. cond-mat/#######'}))
+
class RequestCommentaryForm(forms.ModelForm):
class Meta:
diff --git a/commentaries/models.py b/commentaries/models.py
index ba20886696e2a9c29eed5e88bb01e7c5d72b41e6..c4b9753b0445be588e251aef679951793c6d3fa5 100644
--- a/commentaries/models.py
+++ b/commentaries/models.py
@@ -12,7 +12,7 @@ from scipost.models import SCIPOST_DISCIPLINES
COMMENTARY_TYPES = (
('published', 'published paper'),
- ('preprint', 'arXiv preprint (at least 8 weeks old)'),
+ ('preprint', 'arXiv preprint'),
)
class Commentary(models.Model):
diff --git a/commentaries/templates/commentaries/request_commentary.html b/commentaries/templates/commentaries/request_commentary.html
index 0e86060953c48e162319e3ef43cdab7dfb5e6668..fe5494752b1fe934c90b3ea9ff6952ef54a45b7d 100644
--- a/commentaries/templates/commentaries/request_commentary.html
+++ b/commentaries/templates/commentaries/request_commentary.html
@@ -34,15 +34,23 @@
switch ($('select#id_type').val()) {
case "":
allToggableRows.hide()
+ $("#DOIprefill").hide();
+ $("#arXivprefill").hide();
break;
case "published":
show(published)
+ $("#DOIprefill").show()
+ $("#arXivprefill").hide();
break;
case "preprint":
show(preprint)
+ $("#DOIprefill").hide()
+ $("#arXivprefill").show();
break;
default:
allToggableRows.hide()
+ $("#DOIprefill").hide();
+ $("#arXivprefill").hide();
}
$('select#id_type').on('change', function() {
@@ -50,9 +58,13 @@
switch(selection){
case "published":
show(published)
+ $("#DOIprefill").show()
+ $("#arXivprefill").hide();
break;
case "preprint":
show(preprint)
+ $("#DOIprefill").hide()
+ $("#arXivprefill").show();
break;
default:
allToggableRows.hide()
@@ -73,14 +85,24 @@
<br/>
{% endif %}
- <h3><em>For published papers, you can prefill the form (except for domain, specialization and abstract) using the DOI:</em></h3>
- <p><em>(give the DOI as 10.[4 to 9 digits]/[string], without prefix, as per the placeholder)</em></p>
- <form action="{% url 'commentaries:prefill_using_DOI' %}" method="post">
- {% csrf_token %}
- {{ doiform }}
- <input type="submit" value="Query DOI"/>
- </form>
-
+ <div id="DOIprefill">
+ <h3><em>For published papers, you can prefill the form (except for domain, specialization and abstract) using the DOI:</em></h3>
+ <p><em>(give the DOI as 10.[4 to 9 digits]/[string], without prefix, as per the placeholder)</em></p>
+ <form action="{% url 'commentaries:prefill_using_DOI' %}" method="post">
+ {% csrf_token %}
+ {{ doiform }}
+ <input type="submit" value="Query DOI"/>
+ </form>
+ </div>
+ <div id="arXivprefill">
+ <h3><em>For preprints, you can prefill the form using the arXiv identifier:</em></h3>
+ <p><em>(give the identifier without prefix, as per the placeholder)</em></p>
+ <form action="{% url 'commentaries:prefill_using_identifier' %}" method="post">
+ {% csrf_token %}
+ {{ identifierform }}
+ <input type="submit" value="Query arXiv"/>
+ </form>
+ </div>
<br/>
<form action="{% url 'commentaries:request_commentary' %}" method="post">
{% csrf_token %}
diff --git a/commentaries/urls.py b/commentaries/urls.py
index fbbae4216eaa4d6a24deca7ab4a6066152f7df55..548747e903ddd2a878d3ca4711c375e5781a780d 100644
--- a/commentaries/urls.py
+++ b/commentaries/urls.py
@@ -18,6 +18,7 @@ urlpatterns = [
url(r'^(?P<arxiv_or_DOI_string>arXiv:[a-z-]+/[0-9]{7,}(v[0-9]+)?)/$', views.commentary_detail, name='commentary'),
url(r'^request_commentary$', views.request_commentary, name='request_commentary'),
url(r'^prefill_using_DOI$', views.prefill_using_DOI, name='prefill_using_DOI'),
+ url(r'^prefill_using_identifier$', views.prefill_using_identifier, name='prefill_using_identifier'),
url(r'^request_commentary_ack$', TemplateView.as_view(template_name='commentaries/request_commentary_ack.html'), name='request_commentary_ack'),
url(r'^vet_commentary_requests$', views.vet_commentary_requests, name='vet_commentary_requests'),
url(r'^vet_commentary_request_ack/(?P<commentary_id>[0-9]+)$', views.vet_commentary_request_ack, name='vet_commentary_request_ack'),
diff --git a/commentaries/views.py b/commentaries/views.py
index 7b7e67dbd4ab71422dcfa4a3f3449909a22cb9c2..cfa53fbbc1350fab8301c96c39c7ebcdccfdc4d6 100644
--- a/commentaries/views.py
+++ b/commentaries/views.py
@@ -1,4 +1,5 @@
import datetime
+import feedparser
import re
import requests
@@ -16,7 +17,8 @@ from django.views.decorators.csrf import csrf_protect
from django.db.models import Avg
from .models import Commentary
-from .forms import RequestCommentaryForm, DOIToQueryForm, VetCommentaryForm, CommentarySearchForm
+from .forms import RequestCommentaryForm, DOIToQueryForm, IdentifierToQueryForm
+from .forms import VetCommentaryForm, CommentarySearchForm, commentary_refusal_dict
from comments.models import Comment
from comments.forms import CommentForm
@@ -51,7 +53,8 @@ def request_commentary(request):
existing_commentary = get_object_or_404(Commentary, pub_DOI=form.cleaned_data['pub_DOI'])
if errormessage != '':
doiform = DOIToQueryForm()
- context = {'form': form, 'doiform': doiform,
+ identifierform = IdentifierToQueryForm()
+ context = {'form': form, 'doiform': doiform, 'identifierform': identifierform,
'errormessage': errormessage,
'existing_commentary': existing_commentary}
return render(request, 'commentaries/request_commentary.html', context)
@@ -81,7 +84,8 @@ def request_commentary(request):
else:
form = RequestCommentaryForm()
doiform = DOIToQueryForm()
- context = {'form': form, 'doiform': doiform}
+ identifierform = IdentifierToQueryForm()
+ context = {'form': form, 'doiform': doiform, 'identifierform': identifierform}
return render(request, 'commentaries/request_commentary.html', context)
@permission_required('scipost.can_request_commentary_pages', raise_exception=True)
@@ -101,7 +105,8 @@ def prefill_using_DOI(request):
existing_commentary = get_object_or_404(Commentary, pub_DOI=doiform.cleaned_data['doi'])
if errormessage != '':
form = RequestCommentaryForm()
- context = {'form': form, 'doiform': doiform,
+ identifierform = IdentifierToQueryForm()
+ context = {'form': form, 'doiform': doiform, 'identifierform': identifierform,
'errormessage': errormessage,
'existing_commentary': existing_commentary}
return render(request, 'commentaries/request_commentary.html', context)
@@ -144,7 +149,8 @@ def prefill_using_DOI(request):
'journal': journal, 'volume': volume,
'pages': pages, 'pub_date': pub_date,
'pub_DOI': pub_DOI})
- context = {'form': form, 'doiform': doiform}
+ identifierform = IdentifierToQueryForm()
+ context = {'form': form, 'doiform': doiform, 'identifierform': identifierform,}
context['title'] = pub_title
return render(request, 'commentaries/request_commentary.html', context)
except:
@@ -153,6 +159,76 @@ def prefill_using_DOI(request):
pass
return redirect(reverse('commentaries:request_commentary'))
+@permission_required('scipost.can_request_commentary_pages', raise_exception=True)
+def prefill_using_identifier(request):
+ """ Probes arXiv with the identifier, to pre-fill the form. """
+ if request.method == "POST":
+ identifierform = IdentifierToQueryForm(request.POST)
+ if identifierform.is_valid():
+ # Check if given identifier is of expected form:
+ identifierpattern_new = re.compile("[0-9]{4,}.[0-9]{4,5}v[0-9]{1,2}") # we allow 1 or 2 digits for version
+ identifierpattern_old = re.compile("[-.a-z]+/[0-9]{7,}v[0-9]{1,2}")
+ errormessage = ''
+ existing_commentary = None
+ if not (identifierpattern_new.match(identifierform.cleaned_data['identifier']) or
+ identifierpattern_old.match(identifierform.cleaned_data['identifier'])):
+ errormessage = 'The identifier you entered is improperly formatted (did you forget the version number?).'
+ elif Commentary.objects.filter(arxiv_identifier=identifierform.cleaned_data['identifier']).exists():
+ errormessage = 'There already exists a Commentary Page on this preprint, see'
+ existing_commentary = get_object_or_404(Commentary, arxiv_identifier=identifierform.cleaned_data['identifier'])
+ if errormessage != '':
+ form = RequestCommentaryForm()
+ doiform = DOIToQueryForm()
+ context = {'form': form, 'doiform': doiform, 'identifierform': identifierform,
+ 'errormessage': errormessage,
+ 'existing_commentary': existing_commentary}
+ return render(request, 'commentaries/request_commentary.html', context)
+ # Otherwise we query arXiv for the information:
+ try:
+ queryurl = 'http://export.arxiv.org/api/query?id_list=%s' % identifierform.cleaned_data['identifier']
+ arxivquery = feedparser.parse(queryurl)
+ # If paper has been published, should comment on published version
+ try:
+ arxiv_journal_ref = arxivquery['entries'][0]['arxiv_journal_ref']
+ errormessage = 'This paper has been published as ' + arxiv_journal_ref + '. Please comment on the published version.'
+ except:
+ pass
+ try:
+ arxiv_doi = arxivquery['entries'][0]['arxiv_doi']
+ errormessage = 'This paper has been published under DOI ' + arxiv_DOI + '. Please comment on the published version.'
+ except:
+ pass
+ if errormessage != '':
+ form = RequestCommentaryForm()
+ doiform = DOIToQueryForm()
+ context = {'form': form, 'doiform': doiform, 'identifierform': identifierform,
+ 'errormessage': errormessage,
+ 'existing_commentary': existing_commentary}
+ return render(request, 'commentaries/request_commentary.html', context)
+ # otherwise prefill the form:
+ metadata = arxivquery
+ pub_title = arxivquery['entries'][0]['title']
+ authorlist = arxivquery['entries'][0]['authors'][0]['name']
+ for author in arxivquery['entries'][0]['authors'][1:]:
+ authorlist += ', ' + author['name']
+ arxiv_link = arxivquery['entries'][0]['id']
+ abstract = arxivquery['entries'][0]['summary']
+ form = RequestCommentaryForm(
+ initial={'type': 'preprint', 'metadata': metadata,
+ 'pub_title': pub_title, 'author_list': authorlist,
+ 'arxiv_identifier': identifierform.cleaned_data['identifier'],
+ 'arxiv_link': arxiv_link, 'pub_abstract': abstract})
+ doiform = DOIToQueryForm()
+ context = {'form': form, 'doiform': doiform, 'identifierform': identifierform}
+ context['title'] = pub_title
+ return render(request, 'commentaries/request_commentary.html', context)
+ except:
+ pass
+ else:
+ pass
+ return redirect(reverse('commentaries:request_commentary'))
+
+
@permission_required('scipost.can_vet_commentary_requests', raise_exception=True)
def vet_commentary_requests(request):
contributor = Contributor.objects.get(user=request.user)
@@ -202,7 +278,7 @@ def vet_commentary_request_ack(request, commentary_id):
email_text = ('Dear ' + title_dict[commentary.requested_by.title] + ' ' +
commentary.requested_by.user.last_name + ', \n\nThe Commentary Page you have requested, concerning publication with title ' +
commentary.pub_title + ' by ' + commentary.author_list + ', has not been activated for the following reason: ' +
- form.cleaned_data['refusal_reason'] + '.\n\nThank you for your interest, \nThe SciPost Team.')
+ commentary_refusal_dict(form.cleaned_data['refusal_reason']) + '.\n\nThank you for your interest, \nThe SciPost Team.')
if form.cleaned_data['email_response_field']:
email_text += '\n\nFurther explanations: ' + form.cleaned_data['email_response_field']
emailmessage = EmailMessage('SciPost Commentary Page activated', email_text, 'SciPost commentaries <commentaries@scipost.org>',