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

Tweak ordering to be like the cgi version.

Browse source 
Remove debugging and leftover bits from related_docs function.

Handle unexpected exceptions in related_docs related to schema
oddities described in #98:
* There might not be a row in the RFC table for a given rfc_number of an I-D
* There might be multiple documents published as the same RFC

Don't skip anything when recursing from our equivalents of
get_rfcs_obsoleted and get_rfcs_obsoleted_by.
 - Legacy-Id: 521
This commit is contained in:
Bill Fenner 2007-06-18 22:37:24 +00:00
parent c85c6a59b8
commit 02933825ef
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ietf/idindex/views.py
View file

@ -18,7 +18,7 @@ def wglist(request, wg=None):
) )
else: else:
queryset = IETFWG.objects.filter(group_acronym__acronym__istartswith=wg) queryset = IETFWG.objects.filter(group_acronym__acronym__istartswith=wg)
queryset = queryset.filter(group_type__type='WG').select_related().order_by('g_status.status', 'acronym.acronym') queryset = queryset.filter(group_type__type='WG').select_related().order_by('status_id', 'acronym.acronym')
return object_list(request, queryset=queryset, template_name='idindex/wglist.html', allow_empty=True, extra_context=base_extra) return object_list(request, queryset=queryset, template_name='idindex/wglist.html', allow_empty=True, extra_context=base_extra)
def wgdocs(request, **kwargs): def wgdocs(request, **kwargs):
@ -57,7 +57,7 @@ def otherdocs(request, cat=None):
orl([Q(filename__istartswith="draft-%s-" % p)| orl([Q(filename__istartswith="draft-%s-" % p)|
Q(filename__istartswith="draft-ietf-%s-" % p) Q(filename__istartswith="draft-ietf-%s-" % p)
for p in org.get('prefixes', [ org['key'] ])])) for p in org.get('prefixes', [ org['key'] ])]))
queryset = queryset.order_by('filename') queryset = queryset.order_by('status_id','filename')
extra = base_extra extra = base_extra
extra['category'] = cat extra['category'] = cat
return object_list(request, queryset=queryset, template_name='idindex/otherdocs.html', allow_empty=True, extra_context=extra) return object_list(request, queryset=queryset, template_name='idindex/otherdocs.html', allow_empty=True, extra_context=extra)
@ -127,7 +127,7 @@ def search(request):
except KeyError: except KeyError:
pass # either no other_group arg or no orgs_dict entry pass # either no other_group arg or no orgs_dict entry
matches = InternetDraft.objects.all().filter(*q_objs) matches = InternetDraft.objects.all().filter(*q_objs)
matches = matches.order_by('filename') matches = matches.order_by('status_id', 'filename')
searched = True searched = True
else: else:
matches = None matches = None
@ -167,18 +167,11 @@ def related_docs(startdoc):
def handle(otherdoc,status,doc,skip=(0,0,0)): def handle(otherdoc,status,doc,skip=(0,0,0)):
new = (otherdoc, status, doc) new = (otherdoc, status, doc)
if otherdoc in processed: if otherdoc in processed:
#print "skipping (%s,%s,%s) because otherdoc has been processed" % (new)
return return
#if new not in related: related.append(new)
if True: #otherdoc not in processed: process(otherdoc,skip)
related.append(new)
if otherdoc not in processed: # now simply redundant
process(otherdoc,skip)
def process(doc, skip=(0,0,0)): def process(doc, skip=(0,0,0)):
#XXX
skip = (0,0,0)
#print "doc = %s skip = %s" % (doc,skip)
processed.append(doc) processed.append(doc)
if type(doc) == InternetDraft: if type(doc) == InternetDraft:
if doc.replaced_by_id != 0 and not(skip[0]): if doc.replaced_by_id != 0 and not(skip[0]):
@ -188,21 +181,29 @@ def related_docs(startdoc):
handle(replaces, "that was replaced by", doc, (1,0,0)) handle(replaces, "that was replaced by", doc, (1,0,0))
if doc.rfc_number != 0 and not(skip[0]): if doc.rfc_number != 0 and not(skip[0]):
# should rfc be an FK in the model? # should rfc be an FK in the model?
handle(Rfc.objects.get(rfc_number=doc.rfc_number), "which came from", doc, (1,0,0)) try:
handle(Rfc.objects.get(rfc_number=doc.rfc_number), "which came from", doc, (1,0,0))
# In practice, there are missing rows in the RFC table.
except Rfc.DoesNotExist:
pass
if type(doc) == Rfc: if type(doc) == Rfc:
if not(skip[0]): if not(skip[0]):
try: try:
draft = InternetDraft.objects.get(rfc_number=doc.rfc_number) draft = InternetDraft.objects.get(rfc_number=doc.rfc_number)
#handle(doc, "which came from", draft, backwards=True)
handle(draft, "that was published as", doc, (0,0,1)) handle(draft, "that was published as", doc, (0,0,1))
except InternetDraft.DoesNotExist: except InternetDraft.DoesNotExist:
pass pass
# The table has multiple documents published as the same RFC.
# This raises an AssertionError because using get
# presumes there is exactly one.
except AssertionError:
pass
if not(skip[1]): if not(skip[1]):
for obsoleted_by in doc.updated_or_obsoleted_by.all(): for obsoleted_by in doc.updated_or_obsoleted_by.all():
handle(obsoleted_by.rfc, "that %s" % obsoleted_by.action.lower(), doc, (0,0,1)) handle(obsoleted_by.rfc, "that %s" % obsoleted_by.action.lower(), doc)
if not(skip[2]): if not(skip[2]):
for obsoletes in doc.updates_or_obsoletes.all(): for obsoletes in doc.updates_or_obsoletes.all():
handle(obsoletes.rfc_acted_on, "that was %s by" % obsoletes.action.lower().replace("tes", "ted"), doc, (0,1,0)) handle(obsoletes.rfc_acted_on, "that was %s by" % obsoletes.action.lower().replace("tes", "ted"), doc)
process(startdoc, (0,0,0)) process(startdoc, (0,0,0))
return related return related