From d6baa38fe5a7a9f0f8470676911bd979a3bd7e85 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Tue, 6 Mar 2012 20:36:14 +0000
Subject: [PATCH] Fix problem with reading agenda files, generate it from the
 actual agenda document rather than trying various combinations of extensions
 and upper/lower case  - Legacy-Id: 4046

---
 ietf/meeting/urls.py               |  2 +-
 ietf/meeting/views.py              | 71 ++++++++++++++----------------
 ietf/templates/meeting/agenda.html |  2 +-
 3 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py
index 27f16babf..978c22886 100644
--- a/ietf/meeting/urls.py
+++ b/ietf/meeting/urls.py
@@ -22,7 +22,7 @@ urlpatterns = patterns('',
     (r'^(?P<num>\d+)/agenda/week-view.html$', views.week_view),
     (r'^(?P<num>\d+)/agenda/(?P<session>[A-Za-z0-9-]+)-drafts.pdf$', views.session_draft_pdf),
     (r'^(?P<num>\d+)/agenda/(?P<session>[A-Za-z0-9-]+)-drafts.tgz$', views.session_draft_tarfile),
-    (r'^(?P<num>\d+)/agenda/(?P<session>[A-Za-z0-9-]+)(?P<ext>\.[A-Za-z0-9]+)?$', views.session_agenda),
+    (r'^(?P<num>\d+)/agenda/(?P<session>[A-Za-z0-9-]+)-agenda/$', views.session_agenda),
     (r'^$', views.current_materials),
 )
 
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index d1d364df6..78f1c53b6 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -231,28 +231,22 @@ def text_agenda(request, num=None):
             "plenaryw_agenda":plenaryw_agenda, "plenaryt_agenda":plenaryt_agenda, },
         RequestContext(request)), mimetype="text/plain")
     
-def session_agenda(request, num, session, ext=None):
-    if ext:
-        extensions = [ ext.lstrip(".") ]
-    else:
-        extensions = ["html", "htm", "txt", "HTML", "HTM", "TXT", ]
-    for wg in [session, session.upper(), session.lower()]:
-        for e in extensions:
-            path = settings.AGENDA_PATH_PATTERN % {"meeting":num, "wg":wg, "ext":e}
-            if os.path.exists(path):
-                file = open(path)
-                text = file.read()
-                file.close()
-                if e.lower() == "txt":
-                    return HttpResponse(text, mimetype="text/plain")
-                elif e.lower() == "pdf":
-                    return HttpResponse(text, mimetype="application/pdf")
-                else:
-                    return HttpResponse(text)
-    if ext:
-        raise Http404("No %s agenda for the %s session of IETF %s is available" % (ext, session, num))
-    else:
-        raise Http404("No agenda for the %s session of IETF %s is available" % (session, num))
+def session_agenda(request, num, session):
+    d = Document.objects.filter(type="agenda", session__meeting__number=num, session__group__acronym=session)
+    if d:
+        agenda = d[0]
+        content = read_agenda_file(num, agenda)
+        _, ext = os.path.splitext(agenda.external_url)
+        ext = ext.lstrip(".").lower()
+
+        if ext == "txt":
+            return HttpResponse(content, mimetype="text/plain")
+        elif ext == "pdf":
+            return HttpResponse(content, mimetype="application/pdf")
+        else:
+            return HttpResponse(content)
+
+    raise Http404("No agenda for the %s session of IETF %s is available" % (session, num))
 
 def convert_to_pdf(doc_name):
     import subprocess
@@ -300,27 +294,30 @@ def convert_to_pdf(doc_name):
     pipe("ps2pdf "+psname+" "+outpath)
     os.unlink(psname)
 
+def read_agenda_file(num, doc):
+    path = os.path.join(settings.AGENDA_PATH, "%s/agenda/%s" % (num, doc.external_url))
+    if os.path.exists(path):
+        with open(path) as f:
+            return f.read()
+    else:
+        return None
 
 def session_draft_list(num, session):
     extensions = ["html", "htm", "txt", "HTML", "HTM", "TXT", ]
     result = []
     found = False
-    for wg in [session, session.upper(), session.lower()]:
-        for e in extensions:
-            path = settings.AGENDA_PATH_PATTERN % {"meeting":num, "wg":wg, "ext":e}
-            if os.path.exists(path):
-                file = open(path)
-                agenda = file.read()
-                file.close()
-                found = True
-                break
-        if found:
-           break
-    else:
-      raise Http404("No agenda for the %s session of IETF %s is available" % (session, num))
-    
-    drafts = set(re.findall('(draft-[-a-z0-9]*)',agenda))
 
+    drafts = set()
+
+    for agenda in Document.objects.filter(type="agenda", session__meeting__number=num, session__group__acronym=session):
+        content = read_agenda_file(num, agenda)
+        if content != None:
+            found = True
+            drafts.update(re.findall('(draft-[-a-z0-9]*)', content))
+
+    if not found:
+        raise Http404("No agenda for the %s group of IETF %s is available" % (session, num))
+    
     for draft in drafts:
         try:
             if (re.search('-[0-9]{2}$',draft)):
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index f327c4679..7366b7aa4 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -319,7 +319,7 @@ You can customize the agenda below to show only selected working group sessions.
         <td></td>
         <td colspan="3">
 	  {% if session.info.agenda_file %}
-          <iframe width="100%" height="400px" src="about:blank" xsrc="/meeting/{{ session.info.agenda_file }}" onload="r(this)"></iframe>
+          <iframe width="100%" height="400px" src="about:blank" xsrc="/meeting/{{ meeting.num }}/agenda/{{ session.info.acronym }}-agenda/" onload="r(this)"></iframe>
 	  {% else %}
 	  <b>No Agenda Submitted</b>
 	  {% endif %}