Create redirects from URLs with document-ID to filename based ones.

 - Legacy-Id: 815

Author: fenner

ietf/idindex/testurl.list

@@ -9,9 +9,9 @@
 200,skipdiff		/drafts/all/		https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=all
 200,sort		/drafts/dead/		https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=dead
 #200,sort		/drafts/dead/?sort=name		https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=dead&sort=name
-200,skipdiff		/drafts/9574/related/	https://datatracker.ietf.org/public/idindex.cgi?command=view_related_docs&id=9574
+301,skipdiff		/drafts/9574/related/	https://datatracker.ietf.org/public/idindex.cgi?command=view_related_docs&id=9574
 200			/drafts/draft-ietf-dnsext-dnssec-protocol/related/
-200			/drafts/9574/		https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
+301,skipdiff		/drafts/9574/		https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
 200,skipredirect	/drafts/draft-ietf-dnsext-dnssec-protocol/	https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
 200			/drafts/all_id_txt.html
 200			/drafts/all_id.html

ietf/idindex/urls.py

@@ -24,10 +24,10 @@
      (r'^(?P<cat>rfc)/$', views.showdocs),
      (r'^(?P<cat>current)/$', views.showdocs),
      (r'^(?P<cat>dead)/$', views.showdocs),
-     (r'^(?P<id>\d+)/related/$', views.view_related_docs),
+     (r'^(?P<id>\d+)/related/$', views.redirect_related),
      (r'^(?P<slug>[^/]+)/related/$', views.view_related_docs),
-     (r'^(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', info_dict),
-     (r'^(?P<slug>[^/]+)/$', 'django.views.generic.list_detail.object_detail', dict(info_dict, slug_field='filename')),
+     (r'^(?P<object_id>\d+)/$', views.redirect_id),
+     (r'^(?P<slug>[^/]+)/$', views.view_id, dict(info_dict, slug_field='filename')),
      (r'^all_id_txt.html$', views.all_id, { 'template_name': 'idindex/all_id_txt.html' }),
      (r'^all_id.html$', views.all_id, { 'template_name': 'idindex/all_id.html' }),
      (r'^$', views.search),

ietf/idindex/views.py

@@ -7,6 +7,7 @@
 from django.template import RequestContext, loader
 from django.shortcuts import render_to_response, get_object_or_404
 from django.core.urlresolvers import reverse
+from django.views.generic.list_detail import object_detail
 from ietf.idtracker.models import Acronym, IETFWG, InternetDraft, Rfc
 from ietf.idindex.forms import IDIndexSearchForm
 from ietf.idindex.models import alphabet, orgs, orgs_dict
@@ -214,13 +215,25 @@ def process(doc, skip=(0,0,0)):
     process(startdoc, (0,0,0))
     return related
 
-def view_related_docs(request, **kwargs):
-    if kwargs.has_key('id'):
-	startdoc = get_object_or_404(InternetDraft, id_document_tag=kwargs['id'])
-    else:
-        startdoc = get_object_or_404(InternetDraft, filename=kwargs['slug'])
+def redirect_related(request, id):
+    doc = get_object_or_404(InternetDraft, id_document_tag=id)
+    return HttpResponsePermanentRedirect(reverse(view_related_docs, args=[doc.filename]))
+
+def view_related_docs(request, slug):
+    startdoc = get_object_or_404(InternetDraft, filename=slug)
     related = related_docs(startdoc)
     context = {'related': related, 'numdocs': len(related)}
     context.update(base_extra)
     return render_to_response("idindex/view_related_docs.html", context,
 		context_instance=RequestContext(request))
+
+def redirect_id(request, object_id):
+    '''Redirect from historical document ID to preferred filename url.'''
+    doc = get_object_or_404(InternetDraft, id_document_tag=object_id)
+    return HttpResponsePermanentRedirect(reverse(view_id, args=[doc.filename]))
+
+# Wrapper around object_detail to give permalink a handle.
+# The named-URLs feature in django 0.97 will eliminate the
+# need for these.
+def view_id(*args, **kwargs):
+    return object_detail(*args, **kwargs)