/doc/rfcNNN/: include links to PDF/PS versions (if they exist); handle RFCs that are not available as .txt

 - Legacy-Id: 2084

Author: pasieronen

ietf/idrfc/idrfc_wrapper.py

@@ -287,9 +287,9 @@ def in_ietf_process(self):
         return self.ietf_process != None
 
     def file_types(self):
-        # Not really correct, but the database doesn't
-        # have this data for RFCs yet
-        return [".txt"]
+        types = self._rfcindex.file_formats
+        types = types.replace("ascii","txt")
+        return ["."+x for x in types.split(",")]
 
     # TODO:
     # also/bcp_number/std_number/fyi_number

ietf/idrfc/testurl.list

@@ -30,6 +30,11 @@
 200     /doc/rfc822/
 200     /doc/rfc822/_debug.data
 
+# file formats
+200     /doc/rfc9/ # PDF only
+200	/doc/rfc2490/ # TXT+PDF+PS
+200	/doc/rfc500/ # not online
+
 404	/doc/draft-no-such-draft/
 404	/doc/rfc4637/
 

ietf/idrfc/views_doc.py

@@ -77,9 +77,16 @@ def document_main_rfc(request, rfc_number):
 
     info = {}
     info['is_rfc'] = True
-    (content1, content2) = _get_html(
-        "rfc"+str(rfc_number)+",html", 
-        os.path.join(settings.RFC_PATH, "rfc"+str(rfc_number)+".txt"))
+    info['has_pdf'] = (".pdf" in doc.file_types())
+    info['has_txt'] = (".txt" in doc.file_types())
+    info['has_ps'] = (".ps" in doc.file_types())
+    if info['has_txt']:
+        (content1, content2) = _get_html(
+            "rfc"+str(rfc_number)+",html", 
+            os.path.join(settings.RFC_PATH, "rfc"+str(rfc_number)+".txt"))
+    else:
+        content1 = ""
+        content2 = ""
 
     history = _get_history(doc, None)
 

ietf/templates/idrfc/doc_main_rfc.html

@@ -62,9 +62,26 @@
 
 {% endif %}
 <tr><td>Other versions:</td><td>
+{% if info.has_txt or info.has_ps or info.has_pdf %}
+{% if info.has_txt %}
 <a href="http://www.rfc-editor.org/rfc/rfc{{doc.rfc_number}}.txt">plain text</a>,
+{% endif %}
+{% if info.has_ps %}
+<a href="http://www.rfc-editor.org/rfc/rfc{{doc.rfc_number}}.ps">ps</a>,
+{% endif %}
+{% if info.has_pdf %}
+<a href="http://www.rfc-editor.org/rfc/rfc{{doc.rfc_number}}.pdf">pdf</a>,
+{% else %}
+{% if info.has_txt %}
 <a href="http://www.rfc-editor.org/rfc/pdfrfc/rfc{{doc.rfc_number}}.txt.pdf">pdf</a>,
+{% endif %}
+{% endif %}
+{% if info.has_txt %}
 <a href="http://tools.ietf.org/html/rfc{{doc.rfc_number}}">html</a>
+{% endif %}
+{% else %}
+(not online)
+{% endif %}
 </td></tr>
 {% endblock doc_metatable %}
 
@@ -74,9 +91,17 @@
 {% endblock %}
 
 {% block doc_text1 %}
+{% if info.has_txt %}
 <div class="markup_draft">
 {{ content1|safe }}
 </div>
+{% else %}
+{% if info.has_pdf or info.has_ps %}
+<p>This RFC is not available in plain text format.</p>
+{% else %}
+<p>This RFC is not currently available online.</p>
+{% endif %}
+{% endif %}
 {% endblock %}{# doc_text1 #}
 
 {% block doc_text2 %}