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

Fixed search result ordering where we had comparisons between int and str, which is disallowed in py3.

Browse source 
- Legacy-Id: 16335
This commit is contained in:
Henrik Levkowetz 2019-06-29 13:32:44 +00:00
parent 70c00950b6
commit 42c620f4ae
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ietf/doc/utils_search.py
View file

@ -163,13 +163,16 @@ def prepare_document_table(request, docs, query=None, max_results=200):
# sort
def generate_sort_key(d):
def num(i):
# sortable representation of number as string
return ('%09d' % int(i))
res = []
rfc_num = d.rfc_number()
if d.type_id == "draft":
res.append(["Active", "Expired", "Replaced", "Withdrawn", "RFC"].index(d.search_heading.split()[0]))
res.append(num(["Active", "Expired", "Replaced", "Withdrawn", "RFC"].index(d.search_heading.split()[0])))
else:
res.append(d.type_id);
res.append("-");
@ -182,14 +185,14 @@ def prepare_document_table(request, docs, query=None, max_results=200):
res.append(str(d.latest_revision_date))
elif sort_key == "status":
if rfc_num != None:
res.append(int(rfc_num))
res.append(num(rfc_num))
else:
res.append(d.get_state().order if d.get_state() else None)
res.append(num(d.get_state().order) if d.get_state() else None)
elif sort_key == "ipr":
res.append(len(d.ipr()))
elif sort_key == "ad":
if rfc_num != None:
res.append(int(rfc_num))
res.append(num(rfc_num))
elif d.get_state_slug() == "active":
if d.get_state("draft-iesg"):
res.append(d.get_state("draft-iesg").order)
@ -197,7 +200,7 @@ def prepare_document_table(request, docs, query=None, max_results=200):
res.append(0)
else:
if rfc_num != None:
res.append(int(rfc_num))
res.append(num(rfc_num))
else:
res.append(d.canonical_name())