altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merged in [18905] from housley@vigilsec.com:

Browse source 
Point bibxml3 to I-D archive so that all version numbers are handled properly, and perform more robust revision suffix cleanup. Fixes #3188.
 - Legacy-Id: 18920
Note: SVN reference [18905] has been migrated to Git commit d42aab0d0a
This commit is contained in:
Robert Sparks 2021-03-22 22:30:00 +00:00
parent c13db95673 d42aab0d0a
commit e76d32e61b
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ietf/doc/views_doc.py
View file

@ -819,10 +819,15 @@ def document_history(request, name):
def document_bibtex(request, name, rev=None): def document_bibtex(request, name, rev=None):
# If URL_REGEXPS put trailing digits in rev, they must be two digits # Make sure URL_REGEXPS did not grab too much for the rev number
if rev != None and len(rev) != 2: if rev != None and len(rev) != 2:
name = name+"-"+rev mo = re.search(r"^(?P<m>[0-9]{1,2})-(?P<n>[0-9]{2})$", rev)
rev = None if mo:
name = name+"-"+mo.group(1)
rev = mo.group(2)
else:
name = name+"-"+rev
rev = None
doc = get_object_or_404(Document, docalias__name=name) doc = get_object_or_404(Document, docalias__name=name)
@ -862,9 +867,6 @@ def document_bibxml_ref(request, name, rev=None):
raise Http404() raise Http404()
if not name.startswith('draft-'): if not name.startswith('draft-'):
name = 'draft-'+name name = 'draft-'+name
if rev != None and len(rev) != 2:
name = name+"-"+rev
rev = None
return document_bibxml(request, name, rev=rev) return document_bibxml(request, name, rev=rev)
def document_bibxml(request, name, rev=None): def document_bibxml(request, name, rev=None):
@ -873,16 +875,21 @@ def document_bibxml(request, name, rev=None):
if re.search(r'^rfc\d+$', name): if re.search(r'^rfc\d+$', name):
raise Http404() raise Http404()
# If URL_REGEXPS put trailing digits in rev, they must be two digits # Make sure URL_REGEXPS did not grab too much for the rev number
if rev != None and len(rev) != 2: if rev != None and len(rev) != 2:
name = name+"-"+rev mo = re.search(r"^(?P<m>[0-9]{1,2})-(?P<n>[0-9]{2})$", rev)
rev = None if mo:
name = name+"-"+mo.group(1)
rev = mo.group(2)
else:
name = name+"-"+rev
rev = None
doc = get_object_or_404(Document, name=name, type_id='draft') doc = get_object_or_404(Document, name=name, type_id='draft')
latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision") latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")
latest_rev = latest_revision.rev if latest_revision else None latest_rev = latest_revision.rev if latest_revision else None
if rev != None: if rev != None:
# find the entry in the history # find the entry in the history
for h in doc.history_set.order_by("-time"): for h in doc.history_set.order_by("-time"):

2
ietf/templates/doc/bibxml.xml
View file

@ -16,5 +16,5 @@
</front> </front>
<seriesInfo name="Internet-Draft" value="{{name}}-{{doc.rev}}" /> <seriesInfo name="Internet-Draft" value="{{name}}-{{doc.rev}}" />
{% if doi %}<seriesInfo name="DOI" value="{{doi}}" /> {% if doi %}<seriesInfo name="DOI" value="{{doi}}" />
{% endif %}<format type="TXT" target="https://www.ietf.org/internet-drafts/{{name}}-{{doc.rev}}.txt" /> {% endif %}<format type="TXT" target="https://www.ietf.org/archive/id/{{name}}-{{doc.rev}}.txt" />
</reference> </reference>