Merged from trunk until version 2631

 - Legacy-Id: 2635

Author: sureshkrishnan

suresh/ietf/idrfc/idrfc_wrapper.py

@@ -32,6 +32,8 @@
 
 from ietf.idtracker.models import InternetDraft, IDInternal, BallotInfo, IESGDiscuss, IESGLogin, DocumentComment, Acronym
 from ietf.idrfc.models import RfcEditorQueue
+from ietf.ipr.models import IprRfc, IprDraft, IprDetail
+
 import re
 from datetime import date
 from django.utils import simplejson as json
@@ -498,11 +500,23 @@ def state_change_notice_to(self):
 class IdRfcWrapper:
     rfc = None
     id = None
+    iprCount = None
+    iprUrl = None
 
     def __init__(self, id, rfc):
         self.id = id
         self.rfc = rfc
-
+        if id:
+            iprs = IprDraft.objects.filter(document=self.id.tracker_id)
+            self.iprUrl = "../../ipr/search?option=document_search&id_document_tag=" + str(self.id.tracker_id)
+        elif rfc:
+            iprs = IprRfc.objects.filter(rfc_number=self.rfc.rfc_number) 
+            self.iprUrl = "../../ipr/search?option=rfc_search&rfc_search=" + str(elf.rfc.rfc_number)
+        else:
+            raise ValueError("Construction with null id and rfc")
+        # iprs is a list of docs which contain IPR
+        self.iprCount = len(iprs)
+ 
     def title(self):
         if self.rfc:
             return self.rfc.title

suresh/ietf/idrfc/urls.py

@@ -40,7 +40,7 @@
     (r'^active/$', views_search.active),
     url(r'^ad/(?P<name>[^/]+)/$', views_search.by_ad, name="doc_search_by_ad"),
 
-    url(r'^(?P<name>[^/]+)/$', views_doc.document_main, name="doc_view"),
+    url(r'^(?P<name>[^/]+)/((?P<tab>ballot|writeup|history)/)?$', views_doc.document_main, name="doc_view"),
     (r'^(?P<name>[^/]+)/doc.json$', views_doc.document_debug),
     (r'^(?P<name>[^/]+)/_ballot.data$', views_doc.document_ballot),
     (r'^(?P<name>[^/]+)/ballot.tsv$', views_doc.ballot_tsv),

suresh/ietf/idrfc/views_ballot.py

@@ -228,11 +228,13 @@ def send_ballot_comment(request, name):
         c = comment.text
         subj.append("COMMENT")
 
-    subject = "%s: %s" % (" and ".join(subj), doc.file_tag())
+    ad_name = str(ad)
+    ad_name_genitive = ad_name + "'" if ad_name.endswith('s') else ad_name + "'s"
+    subject = "%s %s on %s" % (ad_name_genitive, " and ".join(subj), doc.filename + '-' + doc.revision_display())
     body = render_to_string("idrfc/ballot_comment_mail.txt",
-                            dict(discuss=d, comment=c))
+                            dict(discuss=d, comment=c, ad=ad, doc=doc))
     frm = u"%s <%s>" % ad.person.email()
-    to = "iesg@ietf.org"
+    to = "The IESG <iesg@ietf.org>"
 
     if request.method == 'POST':
         cc = [x.strip() for x in request.POST.get("cc", "").split(',') if x.strip()]
@@ -632,7 +634,7 @@ def make_last_call(request, name):
         announcement += "\n".join(links)
     else:
         announcement += "\n\n"
-        announcement += "No IPR declarations were found that appear related to this I-D."
+        announcement += "No IPR declarations have been submitted directly on this I-D."
 
     if request.method == 'POST':
         form = MakeLastCallForm(request.POST)

suresh/ietf/idrfc/views_doc.py

@@ -74,7 +74,7 @@ def _get_html(key, filename):
     (c1,c2) = markup_txt.markup(raw_content)
     return (c1,c2)
 
-def document_main_rfc(request, rfc_number):
+def document_main_rfc(request, rfc_number, tab):
     rfci = get_object_or_404(RfcIndex, rfc_number=rfc_number)
     doc = RfcWrapper(rfci)
 
@@ -93,18 +93,24 @@ def document_main_rfc(request, rfc_number):
 
     history = _get_history(doc, None)
 
-    return render_to_response('idrfc/doc_main_rfc.html',
+    template = "idrfc/doc_tab_%s" % tab
+    if tab == "document":
+	template += "_rfc"
+    return render_to_response(template + ".html",
                               {'content1':content1, 'content2':content2,
-                               'doc':doc, 'info':info, 
+                               'doc':doc, 'info':info, 'tab':tab,
+			       'include_text':request.GET.get( 'include_text' ),
                                'history':history},
                               context_instance=RequestContext(request));
 
 @decorator_from_middleware(GZipMiddleware)
-def document_main(request, name):
+def document_main(request, name, tab):
+    if tab is None:
+	tab = "document"
     r = re.compile("^rfc([1-9][0-9]*)$")
     m = r.match(name)
     if m:
-        return document_main_rfc(request, int(m.group(1)))
+        return document_main_rfc(request, int(m.group(1)), tab)
     id = get_object_or_404(InternetDraft, filename=name)
     doc = IdWrapper(id) 
 
@@ -138,9 +144,13 @@ def document_main(request, name):
     versions = _get_versions(id)
     history = _get_history(doc, versions)
 
-    return render_to_response('idrfc/doc_main_id.html',
+    template = "idrfc/doc_tab_%s" % tab
+    if tab == "document":
+	template += "_id"
+    return render_to_response(template + ".html",
                               {'content1':content1, 'content2':content2,
-                               'doc':doc, 'info':info, 
+                               'doc':doc, 'info':info, 'tab':tab,
+			       'include_text':request.GET.get( 'include_text' ),
                                'versions':versions, 'history':history},
                               context_instance=RequestContext(request));
 

suresh/ietf/idtracker/models.py

@@ -178,7 +178,9 @@ def save(self):
     def displayname(self):
         return self.filename
     def file_tag(self):
-        return "<%s-%s.txt>" % (self.filename, self.revision_display())
+        return "<%s>" % (self.filename_with_rev())
+    def filename_with_rev(self):
+        return "%s-%s.txt" % (self.filename, self.revision_display())
     def group_acronym(self):
 	return self.group.acronym
     def group_ml_archive(self):

suresh/ietf/meeting/urls.py

@@ -10,6 +10,8 @@
     (r'^agenda.txt$', views.text_agenda),
     (r'^(?P<num>\d+)/agenda(?:.html)?/?$', views.html_agenda),
     (r'^(?P<num>\d+)/agenda.txt$', views.text_agenda),
+    (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'^$', views.current_materials),
 )

suresh/ietf/meeting/views.py

@@ -4,6 +4,10 @@
 #import models
 import datetime
 import os
+import re
+import tarfile
+
+from tempfile import mkstemp
 
 from django.shortcuts import render_to_response, get_object_or_404
 from ietf.idtracker.models import IETFWG, IRTF, Area
@@ -17,6 +21,9 @@
 from django.utils.decorators import decorator_from_middleware
 from django.middleware.gzip import GZipMiddleware
 from django.db.models import Count
+from ietf.idtracker.models import InternetDraft
+from ietf.idrfc.idrfc_wrapper import IdWrapper
+from ietf.utils.pipe import pipe
 
 from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, MeetingVenue, IESGHistory, Proceeding, Switches, WgProceedingsActivities
 
@@ -148,3 +155,154 @@ def session_agenda(request, num, session, ext=None):
         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 convert_to_pdf(doc_name):
+    import subprocess
+    inpath = os.path.join(settings.INTERNET_DRAFT_PATH, doc_name + ".txt")
+    outpath = os.path.join(settings.INTERNET_DRAFT_PDF_PATH, doc_name + ".pdf")
+
+    try:
+        infile = open(inpath, "r")
+    except Exception, e:
+        return
+
+    t,tempname = mkstemp()
+    tempfile = open(tempname, "w")
+
+    pageend = 0;
+    newpage = 0;
+    formfeed = 0;
+    for line in infile:
+        line = re.sub("\r","",line)
+        line = re.sub("[ \t]+$","",line)
+        if re.search("\[?[Pp]age [0-9ivx]+\]?[ \t]*$",line):
+            pageend=1
+            tempfile.write(line)
+            continue
+        if re.search("^[ \t]*\f",line):
+            formfeed=1
+            tempfile.write(line)
+            continue
+        if re.search("^ *INTERNET.DRAFT.+[0-9]+ *$",line) or re.search("^ *Internet.Draft.+[0-9]+ *$",line) or re.search("^draft-[-a-z0-9_.]+.*[0-9][0-9][0-9][0-9]$",line) or re.search("^RFC.+[0-9]+$",line):
+            newpage=1
+        if re.search("^[ \t]*$",line) and pageend and not newpage:
+            continue
+        if pageend and newpage and not formfeed:
+            tempfile.write("\f")
+        pageend=0
+        formfeed=0
+        newpage=0
+        tempfile.write(line)
+
+    infile.close()
+    tempfile.close()
+    t,psname = mkstemp()
+    pipe("enscript --margins 76::76: -B -q -p "+psname + " " +tempname)
+    os.unlink(tempname)
+    pipe("ps2pdf "+psname+" "+outpath)
+    os.unlink(psname)
+
+
+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))
+
+    for draft in drafts:
+        if (re.search('-[0-9]{2}$',draft)):
+            doc_name = draft
+        else:
+            id = get_object_or_404(InternetDraft, filename=draft)
+            doc = IdWrapper(id)
+            doc_name = draft + "-" + id.revision
+        result.append(doc_name)
+
+    return sorted(list(set(result)))
+
+
+def session_draft_tarfile(request, num, session):
+    drafts = session_draft_list(num, session);
+
+    response = HttpResponse(mimetype='application/octet-stream')
+    response['Content-Disposition'] = 'attachment; filename=%s-drafts.tgz'%(session)
+    tarstream = tarfile.open('','w:gz',response)
+    mfh, mfn = mkstemp()
+    manifest = open(mfn, "w")
+
+    for doc_name in drafts:
+        pdf_path = os.path.join(settings.INTERNET_DRAFT_PDF_PATH, doc_name + ".pdf")
+
+        if (not os.path.exists(pdf_path)):
+            convert_to_pdf(doc_name)
+
+        if os.path.exists(pdf_path):
+            try:
+                tarstream.add(pdf_path, str(doc_name + ".pdf"))
+                manifest.write("Included:  "+pdf_path+"\n")
+            except Exception, e:
+                manifest.write(("Failed (%s): "%e)+pdf_path+"\n")
+        else:
+            manifest.write("Not found: "+pdf_path+"\n")
+
+    manifest.close()
+    tarstream.add(mfn, "manifest.txt")
+    tarstream.close()
+    os.unlink(mfn)
+    return response    
+
+def pdf_pages(file):
+    try:
+        infile = open(file, "r")
+    except Exception, e:
+        return 0
+    for line in infile:
+        m = re.match('\] /Count ([0-9]+)',line)
+        if m:
+            return int(m.group(1))
+    return 0
+
+
+def session_draft_pdf(request, num, session):
+    drafts = session_draft_list(num, session);
+    curr_page = 1
+    pmh, pmn = mkstemp()
+    pdfmarks = open(pmn, "w")
+    pdf_list = ""
+
+    for draft in drafts:
+        pdf_path = os.path.join(settings.INTERNET_DRAFT_PDF_PATH, draft + ".pdf")
+        if (not os.path.exists(pdf_path)):
+            convert_to_pdf(draft)
+
+        if (os.path.exists(pdf_path)):
+            pages = pdf_pages(pdf_path)
+            pdfmarks.write("[/Page "+str(curr_page)+" /View [/XYZ 0 792 1.0] /Title (" + draft + ") /OUT pdfmark\n")
+            pdf_list = pdf_list + " " + pdf_path
+            curr_page = curr_page + pages
+
+    pdfmarks.close()
+    pdfh, pdfn = mkstemp()
+    pipe("gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=" + pdfn + " " + pdf_list + " " + pmn)
+
+    pdf = open(pdfn,"r")
+    pdf_contents = pdf.read()
+    pdf.close()
+
+    os.unlink(pmn)
+    os.unlink(pdfn)
+    return HttpResponse(pdf_contents, mimetype="application/pdf")

suresh/ietf/settings.py

@@ -116,6 +116,7 @@
     'django.contrib.sites',
     'django.contrib.sitemaps',
     'django.contrib.admin',
+    'django.contrib.admindocs',
     'django.contrib.humanize',
     'south',
     'ietf.announcements',
@@ -157,6 +158,7 @@
 # Override this in settings_local.py if needed
 # *_PATH variables ends with a slash/ .
 INTERNET_DRAFT_PATH = '/a/www/ietf-ftp/internet-drafts/'
+INTERNET_DRAFT_PDF_PATH = '/a/www/ietf-datatracker/pdf/'
 RFC_PATH = '/a/www/ietf-ftp/rfc/'
 AGENDA_PATH = '/a/www/www6s/proceedings/'
 AGENDA_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/agenda/%(wg)s.%(ext)s'

suresh/ietf/templates/base.html

@@ -63,7 +63,7 @@
 <div id="ietf-login" class="noprint">{% if user.is_authenticated %}
 {{ user }}
 {% else %}
-<a href="/accounts/login/?next={{request.path|urlencode}}" rel="nofollow">Sign In</a>
+<a href="/accounts/login/?next={{request.get_full_path|urlencode}}" rel="nofollow">Sign In</a>
 {% endif %}</div>
 
 <table style="margin-left:8px;margin-top:8px;" width="98%;">

suresh/ietf/templates/base_leftmenu.html

@@ -63,7 +63,7 @@
 
 <li class="sect">Drafts&nbsp;&amp;&nbsp;RFCs</li>
   <li><a href="/doc/">Search</a></li>
-  <li><form action="/doc/search/" method="post" style="padding-bottom:0;margin-bottom:0;"><input type="text" style="margin-left:10px; width:100px; border:1px solid #89d;" name="name" /><input type="hidden" name="activeDrafts" value="on"/><input type="hidden" name="rfcs" value="on"/></form></li>
+  <li><form action="/doc/search/" method="get" style="padding-bottom:0;margin-bottom:0;"><input type="text" style="margin-left:10px; width:100px; border:1px solid #89d;" name="name" /><input type="hidden" name="activeDrafts" value="on"/><input type="hidden" name="rfcs" value="on"/></form></li>
   <li><a href="https://datatracker.ietf.org/idst/upload.cgi">Submit a draft</a></li>