Avoid multiple doctype declarations and other html errors by parsing sesion agenda html files and inserting our title and doctype.

levkowetz · levkowetz · commit 7dde59f87383 · 2016-06-20T18:01:35.000Z
- Legacy-Id: 11417
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
@@ -10,6 +10,7 @@
 import csv
 import json
 import pytz
+from pyquery import PyQuery
 
 import debug                            # pyflakes:ignore
 
@@ -592,11 +593,22 @@ def session_agenda(request, num, session):
             return HttpResponse(content, content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
         elif ext == "pdf":
             return HttpResponse(content, content_type="application/pdf")
+        elif ext in ["html", "htm"]:
+            d = PyQuery(content)
+            d("head title").empty()
+            d("head title").append(str(agenda))
+            d('meta[http-equiv]').remove()
+            content = "<!doctype html>" + d.html()
+        elif not content:
+            content = "<p>Could not read agenda file '%s'</p>" % agenda.external_url
+            content = (html5_preamble % agenda) + content + html5_postamble
+            agenda = "Error"
         else:
-            if not content:
-                content = "<p>Could not read agenda file '%s'</p>" % agenda.external_url
-                agenda = "Error"
-            return HttpResponse((html5_preamble % agenda) + content + html5_postamble)
+            content = "<p>Unrecognized agend file '%s'</p>" % agenda.external_url
+            content = (html5_preamble % agenda) + content + html5_postamble
+            agenda = "Error"
+
+        return HttpResponse(content)
 
     raise Http404("No agenda for the %s session of IETF %s is available" % (session, num))
 
