Merged in some Django 1.0 related fixes plus conversion script from Pasi. Merged in menubar link fixes from Chris. Merged in abstract generation scripts from Jelte.

 - Legacy-Id: 1605

Author: levkowetz

changelog

@@ -1,11 +1,31 @@
+ietfdb (2.29)
+
+  * New script bin/abstracts.py, intended to be run as a cronjob, to generate
+    the ID abstracts files.  Merged in from Jelte.
+	
+  * Fixed bug in wg-dir.html to support additional area URLs properly.  
+    From Chris.
+
+  * Added new rfcurl filter to eliminate hardcoded references to RFC URLs
+    primarily in the liaisons and drafts pages.  From Chris.
+
+  * Fixed URLs that were broken or outdated by the IETF web page
+    re-organization throughout the tree.  In particular, references to
+    html.charters in URLs, and old charter references.  Including many
+    broken links in leftmenu.  From Chris.
+
+  * Some Django 1.0 related fixes plus conversion script.  From Pasi.
+	
+ -- Henrik Levkowetz <henrik@levkowetz.com>  25 Jul 2009 19:46:45 +0200
+
 ietfdb (2.28)
 
   * Show full name in document comment log.  From Pasi.
 
   * Optimize meeting agenda page to use less SQL queries.  From Pasi.
 
-  * Include version in iesg/agenda/documents.txt.  From Pasi.	
-	
+  * Include version in iesg/agenda/documents.txt.  From Pasi.
+
  -- Henrik Levkowetz <henrik@levkowetz.com>  25 Jul 2009 14:38:41 +0200
 
 ietfdb (2.27)

ietf/bin/convert-096.py

@@ -0,0 +1,108 @@
+# Copyright (C) 2009 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
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#  * Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  * Redistributions in binary form must reproduce the above
+#    copyright notice, this list of conditions and the following
+#    disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#
+#  * Neither the name of the Nokia Corporation and/or its
+#    subsidiary(-ies) nor the names of its contributors may be used
+#    to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from os.path import exists
+import os
+import re
+
+def convert_py(file):
+    print "  Converting ", file
+    inf = open(file)
+    outf_name = file+'.tmp~'
+    outf = open(outf_name, "w")
+    fixes = {}
+    for line in inf:
+        if re.search("Field.*maxlength=\d", line):
+            line = line.replace("maxlength=", "max_length=")
+            fixes['changed maxlength to max_length'] = True
+        if re.search("^\s*from django import newforms as forms\s*$", line):
+            line = "from django import forms\n"
+            fixes['changed newforms to forms'] = True
+        if re.search("^\s*import django.newforms as forms\s*$", line):
+            line = "from django import forms\n"
+            fixes['changed newforms to forms'] = True
+        if re.search("^\s*from django.core.validators import email_re\s*$", line):
+            line = "from django.forms.fields import email_re\n"
+            fixes['changed email_re import'] = True
+        if re.search("ForeignKey.*raw_id_admin=True", line):
+            line = re.sub(",\s*raw_id_admin=True", "", line)
+            fixes['removed raw_id_admin'] = True
+        if re.search("ForeignKey.*edit_inline=True", line):
+            line = re.sub(",\s*edit_inline=True", "", line)
+            fixes['removed edit_inline'] = True
+        if re.search("ForeignKey.*edit_inline=models\.\w+", line):
+            line = re.sub(",\s*edit_inline=models\.\w+", "", line)
+            fixes['removed edit_inline'] = True
+        if re.search("ForeignKey.*num_in_admin=\d+", line):
+            line = re.sub(",\s*num_in_admin=\d+", "", line)
+            fixes['removed num_in_admin'] = True
+        if re.search("ForeignKey.*max_num_in_admin=\d+", line):
+            line = re.sub(",\s*max_num_in_admin=\d+", "", line)
+            fixes['removed max_num_in_admin'] = True
+        if re.search("ManyToManyField.*filter_interface=models\.\w+", line):
+            line = re.sub(",\s*filter_interface=models\.\w+", "", line)
+            fixes['removed filter_interface'] = True
+        if re.search("(Field|ForeignKey).*core=True", line):
+            line = re.sub(",\s*core=True", "", line)
+            fixes['removed core'] = True
+        if re.search("\.clean_data", line):
+            line = re.sub("\.clean_data", ".cleaned_data", line)
+            fixes['cleaned_data'] = True
+        outf.write(line)
+    inf.close()
+    fixes_list = fixes.keys()
+    fixes_list.sort()
+    something_fixed = len(fixes_list) > 0
+    if something_fixed:
+        outf.write("\n# changes done by convert-096.py:")
+        outf.write("\n# ".join(fixes_list))
+        outf.write("\n")
+    outf.close()
+    if something_fixed:
+        os.rename(file, file+'.backup~')
+        os.rename(outf_name, file)
+        print "  Fixes: "+", ".join(fixes_list)
+    else:
+        os.remove(outf_name)
+
+if not exists("settings.py"):
+    raise Exception("Please run this in directory containing settings.py")
+
+for root, dirs, files in os.walk("."):
+    if root.find(".svn") >= 0:
+        continue
+    print "Processing ", root
+    for file in files:
+        if file.endswith(".py"):
+            convert_py(root+"/"+file)
+
+

ietf/idrfc/models.py

@@ -41,8 +41,7 @@ class RfcEditorQueue(models.Model):
         (3, 'IRTF'),
         (4, 'Independent')
     )
-    draft = models.OneToOneField(InternetDraft, db_column="id_document_tag", related_name="rfc_editor_queue_state")
-    #draft = models.CharField(maxlength=200,primary_key=True)
+    draft = models.OneToOneField(InternetDraft, db_column="id_document_tag", related_name="rfc_editor_queue_state",primary_key=True)
     date_received = models.DateField()
     state = models.CharField(maxlength=200, blank=True, null=True)
     # currently, queue2.xml does not have this information, so

ietf/idtracker/models.py

@@ -588,7 +588,7 @@ def public_comments(self):
     def comments(self):
 	# would filter by rfc_flag but the database is broken. (see
 	# trac ticket #96) so this risks collisions.
-	return self.documentcomment_set.all().order_by('-comment_date','-comment_time','-id')
+	return self.documentcomment_set.all().order_by('-date','-time','-id')
     def ballot_set(self):
 	return IDInternal.objects.filter(ballot=self.ballot_id).order_by('-primary_flag')
     def ballot_primary(self):

ietf/idtracker/templatetags/ietf_filters.py

@@ -1,6 +1,7 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
 import textwrap
+import django
 from django import template
 from django.utils.html import escape, fix_ampersands, linebreaks
 from django.template.defaultfilters import linebreaksbr
@@ -199,6 +200,15 @@ def rfcnospace(string):
     else:
         return string
 
+@register.filter(name='rfcurl')
+def rfclink(string):
+    """
+    This takes just the RFC number, and turns it into the
+    URL for that RFC.
+    """
+    string = str(string);
+    return "http://tools.ietf.org/html/rfc" + string;
+
 @register.filter(name='dashify')
 def dashify(string):
     """
@@ -311,6 +321,12 @@ def equal(x, y):
 def in_group(user, groups):
     return user and user.is_authenticated() and bool(user.groups.filter(name__in=groups.split(',')).values('name'))
 
+# DJANGO_096: a dummy safe filter for Django 0.96
+if django.VERSION[0] == 0:
+    @register.filter
+    def safe(x):
+        return x
+
 def _test():
     import doctest
     doctest.testmod()

ietf/idtracker/views.py

@@ -76,7 +76,7 @@ def search(request):
 	if status != '':
 	    q_objs.append(Q(draft__status=status,rfc_flag=0))
 	matches = IDInternal.objects.all().filter(*q_objs)
-	matches = matches.order_by('cur_state', 'cur_sub_state', 'ballot_id', '-primary_flag')
+	matches = matches.order_by('cur_state', 'cur_sub_state', 'ballot', '-primary_flag')
         # sort by date in reverse
         # first build docstate groups, within which we sort
         # in each docstate group, we build ballot id groups, which we sort
@@ -207,11 +207,11 @@ def send_email(request):
 	context_instance=RequestContext(request))
 
 def status(request):
-    queryset = IDInternal.objects.filter(primary_flag=1).exclude(cur_state__state__in=('RFC Ed Queue', 'RFC Published', 'AD is watching', 'Dead')).order_by('cur_state', 'status_date', 'ballot_id')
+    queryset = IDInternal.objects.filter(primary_flag=1).exclude(cur_state__state__in=('RFC Ed Queue', 'RFC Published', 'AD is watching', 'Dead')).order_by('cur_state', 'status_date', 'ballot')
     return object_list(request, template_name="idtracker/status_of_items.html", queryset=queryset, extra_context={'title': 'IESG Status of Items'})
 
 def last_call(request):
-    queryset = IDInternal.objects.filter(primary_flag=1).filter(cur_state__state__in=('In Last Call', 'Waiting for Writeup', 'Waiting for AD Go-Ahead')).order_by('cur_state', 'status_date', 'ballot_id')
+    queryset = IDInternal.objects.filter(primary_flag=1).filter(cur_state__state__in=('In Last Call', 'Waiting for Writeup', 'Waiting for AD Go-Ahead')).order_by('cur_state', 'status_date', 'ballot')
     return object_list(request, template_name="idtracker/status_of_items.html", queryset=queryset, extra_context={'title': 'Documents in Last Call', 'lastcall': 1})
 
 def redirect_id(request, object_id):

ietf/iesg/views.py

@@ -117,8 +117,8 @@ def agenda_docs(date, next_agenda):
         matches = IDInternal.objects.filter(telechat_date=date, primary_flag=1, agenda=1)
     else:
         matches = IDInternal.objects.filter(telechat_date=date, primary_flag=1)
-    idmatches = matches.filter(rfc_flag=0).order_by('ballot_id')
-    rfcmatches = matches.filter(rfc_flag=1).order_by('ballot_id')
+    idmatches = matches.filter(rfc_flag=0).order_by('ballot')
+    rfcmatches = matches.filter(rfc_flag=1).order_by('ballot')
     res = {}
     for id in list(idmatches)+list(rfcmatches):
         section_key = "s"+get_doc_section(id)
@@ -212,8 +212,8 @@ def telechat_agenda_documents(request):
     telechats = []
     for date in dates:
         matches = IDInternal.objects.filter(telechat_date=date,primary_flag=1,agenda=1)
-        idmatches = matches.filter(rfc_flag=0).order_by('ballot_id')
-        rfcmatches = matches.filter(rfc_flag=1).order_by('ballot_id')
+        idmatches = matches.filter(rfc_flag=0).order_by('ballot')
+        rfcmatches = matches.filter(rfc_flag=1).order_by('ballot')
         res = {}
         for id in list(idmatches)+list(rfcmatches):
             section_key = "s"+get_doc_section(id)

ietf/templates/idindex/doclist.html

@@ -1,4 +1,5 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
+{% load ietf_filters %}
 <!-- {{ object_list|length }} result{{ object_list|length|pluralize }}.<br> -->
 <b>Please click a document below to view detail information,
 or the [draft] link for the document itself.</b><br>
@@ -29,7 +30,7 @@
 {% else %}
 <td>
 {% if draft.rfc_number %}
-<a href="http://www.ietf.org/rfc/rfc{{ draft.rfc_number|stringformat:"04d" }}.txt">{{ draft.rfc_number }}</a>
+<a href="{{ draft.rfc_number|rfcurl }}">{{ draft.rfc_number }}</a>
 {% else %}
 &nbsp;
 {% endif %}

ietf/templates/idindex/internetdraft_detail.html

@@ -1,5 +1,5 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
-{% extends "idindex/base.html" %}
+{% extends "idindex/base.html" %}{% load ietf_filters %}
 
 {% block title %}Internet Draft Database Index - {{ object.filename }}{% endblock %}
 
@@ -13,7 +13,7 @@ <h2>{{ object.filename }}-{{ object.revision_display }}</h2>
 <li> <b><a href="related/">View Related Documents</a></b> (e.g., documents that replaced or were replaced by the subject I-D, and their derivatives and precursors.)</li>
 {% ifequal object.group.acronym "none" %}
 {% else %}
-<li> <b>IETF Working Group: <a href="http://www.ietf.org/html.charters/{{ object.group.acronym }}-charter.html">{{ object.group.name }}</a></li>
+<li> <b>IETF Working Group: <a href="http://www.ietf.org/dyn/wg/charter/{{ object.group.acronym }}-charter.html">{{ object.group.name }}</a></li>
 {% endifequal %}
 <li> <b>I-D Title:</b> {{ object.title }}</li>
 <li> <b>I-D Status:</b> {{ object.status }}
@@ -25,7 +25,7 @@ <h2>{{ object.filename }}-{{ object.revision_display }}</h2>
 {% endif %}
 </li>
 <li> <b>I-D Intended Status at Publication:</b> {{ object.intended_status }}</li>
-<li> <b>RFC Number:</b> {% if object.rfc_number %}<a href="http://www.ietf.org/rfc/rfc{{ object.rfc_number }}.txt">{{ object.rfc_number }}</a>{% endif %}</li>
+<li> <b>RFC Number:</b> {% if object.rfc_number %}<a href="{{ object.rfc_number|rfcurl }}">{{ object.rfc_number }}</a>{% endif %}</li>
 <li> <b><a href="{% url ietf.idtracker.views.search %}">I-D Tracker</a> State:</b>
 {% if object.idtracker %}
 <a href="/idtracker/{{ object.filename }}/">{{ object.idstate }}</a>

ietf/templates/idrfc/by_ad.html

@@ -1,3 +1,4 @@
+{% extends "idrfc/base.html" %}
 {% comment %}
 Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com> 
@@ -32,7 +33,6 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {% endcomment %}
 
-{% extends "idrfc/base.html" %}
 
 {% block title %}Internet-Drafts and RFCs for {{ ad_name }}
 {% endblock %}