/doc/rfcNNNN/: show the internet-draft name (if known) and link to its history

 - Legacy-Id: 2017

Author: pasieronen

ietf/idrfc/idrfc_wrapper.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -231,6 +231,7 @@ class RfcWrapper:
     publication_date = None
     maturity_level = None
     ietf_process = None
+    draft_name = None
 
     def __init__(self, rfcindex, rfc=None, idinternal=None):
         self._rfcindex = rfcindex
@@ -253,6 +254,16 @@ def __init__(self, rfcindex, rfc=None, idinternal=None):
         if not self.maturity_level:
             self.maturity_level = "Unknown"
 
+        ids = InternetDraft.objects.filter(rfc_number=self.rfc_number)
+        if len(ids) >= 1:
+            self.draft_name = ids[0].filename
+        elif self._rfcindex and self._rfcindex.draft:
+            # rfcindex occasionally includes drafts that were not
+            # really submitted to IETF (e.g. April 1st)
+            ids = InternetDraft.objects.filter(filename=self._rfcindex.draft)
+            if len(ids) > 0:
+                self.draft_name = self._rfcindex.draft
+            
     def _rfc_doc_list(self, name):
         if (not self._rfcindex) or (not self._rfcindex.__dict__[name]):
             return None
@@ -495,30 +506,6 @@ def view_sort_key_byad(self):
         else:
             return "3"
 
-#     def debug_data(self):
-#         s = ""
-#         if self.draft:
-#             s = s + "draft("+self.draft.filename+","+str(self.draft.id_document_tag)+","+str(self.draft.rfc_number)+")"
-#         if self.idinternal:
-#             s = s + ",idinternal()"
-#         if self._rfc:
-#             s = s + ",rfc("+str(self._rfc.rfc_number)+")"
-#         if self.rfcIndex:
-#             s = s + ",rfcIndex("+str(self.rfcIndex.rfc_number)+")"
-#         if self.rfc_idinternal:
-#             s = s + ",rfc_idinternal("+str(self.rfc_idinternal.draft_id)+")"
-#         return s
-
-            
-#     if idinternal:
-#         o['stateChangeNoticeTo'] = idinternal.state_change_notice_to
-#         if idinternal.returning_item > 0:
-#             o['telechatReturningItem'] = True
-#         if idinternal.telechat_date:
-#             o['telechatDate'] = str(idinternal.telechat_date)
-#             o['onTelechatAgenda'] = (idinternal.agenda > 0)
-#
-
 # ---------------------------------------------------------------------------
 
 class BallotWrapper:

ietf/idrfc/testurl.list

@@ -26,6 +26,10 @@
 200	/doc/rfc3852/_debug.data
 200	/doc/rfc3852/_ballot.data
 
+# old RFC
+200     /doc/rfc822/
+200     /doc/rfc822/_debug.data
+
 404	/doc/draft-no-such-draft/
 404	/doc/rfc4637/
 

ietf/idrfc/views_doc.py

@@ -161,7 +161,11 @@ def _get_history(doc, versions):
     if doc.is_id_wrapper and doc.draft_status == "Expired" and doc._draft.expiration_date:
         results.append({'is_text':True, 'date':doc._draft.expiration_date, 'text':'Draft expired'})
     if doc.is_rfc_wrapper:
-        results.append({'is_text':True, 'date':doc.publication_date, 'text':'RFC Published'})
+        if doc.draft_name:
+            text = 'RFC Published (see <a href="/doc/%s/">%s</a> for earlier history)' % (doc.draft_name,doc.draft_name)
+        else:
+            text = 'RFC Published'
+        results.append({'is_text':True, 'date':doc.publication_date, 'text':text})
 
     # convert plain dates to datetimes (required for sorting)
     for x in results:

ietf/templates/idrfc/doc_history.html

@@ -49,7 +49,7 @@
 {% if c.is_text %}
 <td>&nbsp;</td>
 <td>(System)</td>
-<td>{{ c.text }}</td>
+<td>{{ c.text|safe }}</td>
 {% endif %}
 
 {% if c.is_com %}

ietf/templates/idrfc/doc_main_rfc.html

@@ -43,6 +43,7 @@
 {% if doc.updated_by %}<br />Updated by {{ doc.updated_by }}{%endif %}
 {% if doc.obsoletes %}<br />Obsoletes {{ doc.obsoletes }}{%endif %}
 {% if doc.updates %}<br />Updates {{ doc.updates }}{%endif %}
+{% if doc.draft_name %}<br/ >Was <a href="/doc/{{ doc.draft_name}}/">{{doc.draft_name}}</a>{% endif %}
 </td></tr>
 <tr><td>Published:</td><td> {{ doc.publication_date|default:"(data missing)" }}</td></tr>
 {% if doc.in_ietf_process %}