Merged r840 from branch/2.00 to trunk, and updated version information in ietf/__init__.py

 - Legacy-Id: 841

Author: levkowetz

ietf/__init__.py

@@ -1,9 +1,9 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-__version__ = "2.01-dev"
+__version__ = "2.xx-trunk"
 
 __date__    = "$Date$"
 
-__rev__     = "$Rev:$ (dev) Latest release: Rev. 726 "
+__rev__     = "$Rev$ (dev) Latest release: Rev. 838 "
 
 __id__      = "$Id$"

ietf/bin/pretty-xml-dump

@@ -0,0 +1,5 @@
+#!/bin/sh
+python manage.py dumpdata --format=xml "$@" | sed -e 's/<\/*object/\
+  &/g' -e 's/<field/\
+    &/g' -e 's/<\/django-objects/\
+&/g'

ietf/idindex/testurl.list

@@ -1,19 +1,20 @@
-200			/drafts/wg/1041/	https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
+301,skipdiff		/drafts/wgid/1041/	https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
 200,skipredirect	/drafts/wg/idr/		https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
 200			/drafts/wg/I/		https://datatracker.ietf.org/public/idindex.cgi?command=show_wg&fl=I
 200			/drafts/ind/F/		https://datatracker.ietf.org/public/idindex.cgi?command=show_ind_id&fl=F
 200			/drafts/other/tools/	https://datatracker.ietf.org/public/idindex.cgi?command=show_other&cat=tools
 200,sort		/drafts/rfc/		https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc
-200,sort		/drafts/rfc/?sort=name	https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc&sort=name
+#200,sort		/drafts/rfc/?sort=name	https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc&sort=name
 200,skipdiff		/drafts/current/	https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=current
 200,skipdiff		/drafts/all/		https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=all
-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
+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
+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
 200,skipdiff		/drafts/		https://datatracker.ietf.org/public/idindex.cgi?command=search_id
 200			/drafts/		https://datatracker.ietf.org/public/idindex.cgi
-404			/drafts/wg/11/
+200			/drafts/wg/11/

ietf/idindex/urls.py

@@ -15,19 +15,19 @@
 }
 
 urlpatterns = patterns('',
-     (r'^wg/(?P<id>\d+)/$', views.wgdocs),
-     (r'^wg/(?P<slug>[^/]+)/$', views.wgdocs),
+     (r'^wgid/(?P<id>\d+)/$', views.wgdocs_redir),
+     (r'^wg/(?P<wg>[^/]+)/$', views.wgdocs),
      (r'^ind/(?P<filter>[^/]+)/$', views.inddocs),
      (r'^other/(?P<cat>[^/]+)/$', views.otherdocs),
      # (?P<cat>(?:all|rfc|current|dead)) really confuses reverse()
      (r'^(?P<cat>all)/$', views.showdocs),
      (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

@@ -1,38 +1,41 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponsePermanentRedirect
 from django.views.generic.list_detail import object_list
 from django.db.models import Q
 from django.http import Http404
 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
-from ietf.utils import orl, flattenl
+from ietf.utils import orl, flattenl, normalize_draftname
 
 base_extra = { 'alphabet': alphabet, 'orgs': orgs }
 
-def wgdocs(request, **kwargs):
-    if kwargs.has_key('id'):
-	queryset = InternetDraft.objects.filter(group=kwargs['id'])
-	group = get_object_or_404(Acronym, acronym_id=kwargs['id'])
-    else:
-	wg = kwargs['slug']
-	try:
-	    group = Acronym.objects.get(acronym=wg)
-	except Acronym.DoesNotExist:	# try a search
-	    if wg == 'other':
-		queryset = IETFWG.objects.filter(
-		    orl([Q(group_acronym__acronym__istartswith="%d" % i) for i in range(0,10)])
-		    )
-	    else:
-		queryset = IETFWG.objects.filter(group_acronym__acronym__istartswith=wg)
-	    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)
-        queryset = InternetDraft.objects.filter(group__acronym=wg)
+def wgdocs_redir(request, id):
+    group = get_object_or_404(Acronym, acronym_id=id)
+    return HttpResponsePermanentRedirect(reverse(wgdocs, args=[group.acronym]))
+
+def wgdocs(request, wg):
+    try:
+	group = Acronym.objects.get(acronym=wg)
+    except Acronym.DoesNotExist:	# try a search
+	if wg == 'other':
+	    queryset = IETFWG.objects.filter(
+		orl([Q(group_acronym__acronym__istartswith="%d" % i) for i in range(0,10)])
+		)
+	else:
+	    queryset = IETFWG.objects.filter(group_acronym__acronym__istartswith=wg)
+	queryset = queryset.filter(group_type__type='WG').select_related().order_by('status_id', 'acronym.acronym')
+	extra = base_extra.copy()
+	extra['search'] = wg
+	return object_list(request, queryset=queryset, template_name='idindex/wglist.html', allow_empty=True, extra_context=extra)
+    queryset = InternetDraft.objects.filter(group__acronym=wg)
     queryset = queryset.order_by('status_id', 'filename')
-    extra = base_extra
+    extra = base_extra.copy()
     extra['group'] = group
     return object_list(request, queryset=queryset, template_name='idindex/wgdocs.html', allow_empty=True, extra_context=extra)
 
@@ -47,7 +50,7 @@ def inddocs(request, filter=None):
     else:
 	queryset = InternetDraft.objects.filter(filename__istartswith='draft-' + filter)
     queryset = queryset.exclude(ind_exception).filter(group__acronym='none').order_by('filename')
-    extra = base_extra
+    extra = base_extra.copy()
     extra['filter'] = filter
     return object_list(request, queryset=queryset, template_name='idindex/inddocs.html', allow_empty=True, extra_context=extra)
 
@@ -61,7 +64,7 @@ def otherdocs(request, cat=None):
 	     Q(filename__istartswith="draft-ietf-%s-" % p)
 		for p in org.get('prefixes', [ org['key'] ])]))
     queryset = queryset.order_by('status_id','filename')
-    extra = base_extra
+    extra = base_extra.copy()
     extra['category'] = cat
     return object_list(request, queryset=queryset, template_name='idindex/otherdocs.html', allow_empty=True, extra_context=extra)
 
@@ -98,6 +101,9 @@ def showdocs(request, cat=None):
 
 
 def search(request):
+    args = request.GET.copy()
+    if args.has_key('filename'):
+	args['filename'] = normalize_draftname(args['filename'])
     form = IDIndexSearchForm()
     t = loader.get_template('idindex/search.html')
     # if there's a query, do the search and supply results to the template
@@ -110,20 +116,20 @@ def search(request):
 	      'first_name': 'authors__person__first_name__icontains',
 	    }
     for key in qdict.keys() + ['other_group']:
-	if key in request.REQUEST:
+	if key in args:
 	    searching = True
     if searching:
 	# '0' and '-1' are flag values for "any"
 	# in the original .cgi search page.
 	# They are compared as strings because the
 	# query dict is always strings.
-	q_objs = [Q(**{qdict[k]: request.REQUEST[k]})
+	q_objs = [Q(**{qdict[k]: args[k]})
 		for k in qdict.keys()
-		if request.REQUEST.get(k, '') != '' and
-		   request.REQUEST[k] != '0' and
-		   request.REQUEST[k] != '-1']
+		if args.get(k, '') != '' and
+		   args[k] != '0' and
+		   args[k] != '-1']
 	try:
-	    other = orgs_dict[request.REQUEST['other_group']]
+	    other = orgs_dict[args['other_group']]
 	    q_objs += [orl(
 		[Q(filename__istartswith="draft-%s-" % p)|
 		 Q(filename__istartswith="draft-ietf-%s-" % p)
@@ -212,13 +218,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 = {'related': related, 'numdocs': len(related), 'startdoc': startdoc}
     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)

ietf/idtracker/feeds.py

@@ -1,29 +1,35 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed
-from ietf.idtracker.models import InternetDraft, DocumentComment
+from ietf.idtracker.models import IDInternal
 import datetime
+import re
 
 class DocumentComments(Feed):
     feed_type = Atom1Feed
     def get_object(self, bits):
 	if len(bits) != 1:
-	    raise InternetDraft.DoesNotExist
-	return InternetDraft.objects.get(filename=bits[0])
+	    raise IDInternal.DoesNotExist
+	rfc = re.match('rfc(\d+)', bits[0])
+	if rfc:
+	    return IDInternal.objects.get(draft_id=int(rfc.group(1)), rfc_flag=1)
+	else:
+	    return IDInternal.objects.get(draft__filename=bits[0], rfc_flag=0)
 
     def title(self, obj):
-	return "I-D Tracker comments for %s" % obj.filename
+	return "I-D Tracker comments for %s" % obj.document().filename
 
     def link(self, obj):
-	return "/idtracker/%s" % obj.filename
-	# obj.get_absolute_url() ?
+	if obj is None:
+	    raise FeedDoesNotExist
+	return obj.get_absolute_url()
 
     def description(self, obj):
-	self.title(obj)
+	return self.title(obj)
 
     def items(self, obj):
-	return DocumentComment.objects.filter(document=obj.id_document_tag).order_by("-date")[:15]
+	return obj.public_comments().order_by("-date")[:15]
 
     def item_pubdate(self, item):
 	time = datetime.time(*[int(t) for t in item.time.split(":")])