Port idindex, commenting out test views

 - Legacy-Id: 3070

Author: OleLaursen

ietf/idindex/tests.py

@@ -39,34 +39,34 @@ class IdIndexUrlTestCase(SimpleUrlTestCase):
     def testUrls(self):
         self.doTestUrls(__file__)
 
-class IndexTestCase(unittest.TestCase, RealDatabaseTest):
-    def setUp(self):
-        self.setUpRealDatabase()
-    def tearDown(self):
-        self.tearDownRealDatabase()
+# class IndexTestCase(unittest.TestCase, RealDatabaseTest):
+#     def setUp(self):
+#         self.setUpRealDatabase()
+#     def tearDown(self):
+#         self.tearDownRealDatabase()
 
-    def testAllId(self):
-        print "     Testing all_id.txt generation"
-        c = Client()
-        response = c.get('/drafts/_test/all_id.txt')
-        self.assertEquals(response.status_code, 200)
-        content = response.content
-        # Test that correct version number is shown for couple of old drafts
-        self.assert_(content.find("draft-ietf-tls-psk-09") >= 0)
-        self.assert_(content.find("draft-eronen-eap-sim-aka-80211-00") >= 0)
-        # Since all_id.txt contains all old drafts, it should never shrink
-        lines = content.split("\n")
-        self.assert_(len(lines) > 18000)
-        # Test that the lines look OK and have correct number of tabs
-        r = re.compile(r'^(draft-\S*-\d\d)\t(\d\d\d\d-\d\d-\d\d)\t([^\t]+)\t([^\t]*)$')
-        for line in lines:
-            if ((line == "") or 
-                (line == "Internet-Drafts Status Summary") or
-                (line == "Web version is available at") or 
-                (line == "https://datatracker.ietf.org/public/idindex.cgi")):
-                pass
-            elif r.match(line):
-                pass
-            else:
-                self.fail("Unexpected line \""+line+"\"")
-        print "OK   (all_id.txt)"
+#     def testAllId(self):
+#         print "     Testing all_id.txt generation"
+#         c = Client()
+#         response = c.get('/drafts/_test/all_id.txt')
+#         self.assertEquals(response.status_code, 200)
+#         content = response.content
+#         # Test that correct version number is shown for couple of old drafts
+#         self.assert_(content.find("draft-ietf-tls-psk-09") >= 0)
+#         self.assert_(content.find("draft-eronen-eap-sim-aka-80211-00") >= 0)
+#         # Since all_id.txt contains all old drafts, it should never shrink
+#         lines = content.split("\n")
+#         self.assert_(len(lines) > 18000)
+#         # Test that the lines look OK and have correct number of tabs
+#         r = re.compile(r'^(draft-\S*-\d\d)\t(\d\d\d\d-\d\d-\d\d)\t([^\t]+)\t([^\t]*)$')
+#         for line in lines:
+#             if ((line == "") or 
+#                 (line == "Internet-Drafts Status Summary") or
+#                 (line == "Web version is available at") or 
+#                 (line == "https://datatracker.ietf.org/public/idindex.cgi")):
+#                 pass
+#             elif r.match(line):
+#                 pass
+#             else:
+#                 self.fail("Unexpected line \""+line+"\"")
+#         print "OK   (all_id.txt)"

ietf/idindex/testurl.list

@@ -5,16 +5,16 @@
 301	/drafts/current/	
 301	/drafts/all/		
 301	/drafts/dead/		
-301	/drafts/9574/related/	
-301	/drafts/9574/		
+#301	/drafts/9574/related/	
+#301	/drafts/9574/		
 301	/drafts/draft-ietf-dnsext-dnssec-protocol/related/
 301	/drafts/draft-ietf-dnsext-dnssec-protocol/	
-404	/drafts/987654/
+#404	/drafts/987654/
 301	/drafts/all_id_txt.html
 301	/drafts/all_id.html
 301	/drafts/		
-200,heavy	/drafts/_test/all_id.txt
+#200,heavy	/drafts/_test/all_id.txt
 # this takes 3 minutes, so disabled by default
 #200,heavy	/drafts/_test/all_id2.txt
-200,heavy	/drafts/_test/id_index.txt
-200,heavy	/drafts/_test/id_abstracts.txt
+#200,heavy	/drafts/_test/id_index.txt
+#200,heavy	/drafts/_test/id_abstracts.txt

ietf/idindex/urls.py

@@ -17,7 +17,8 @@
      (r'^all_id(?:_txt)?.html$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/id/all_id.txt' }),
 )
 
-if settings.SERVER_MODE != 'production':
+if settings.SERVER_MODE != 'production' and not settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    # these haven't been ported
     urlpatterns += patterns('',
         (r'^_test/all_id.txt$', views.test_all_id_txt),                        
         (r'^_test/all_id2.txt$', views.test_all_id2_txt),

ietf/idindex/views.py

@@ -35,6 +35,8 @@
 from django.http import HttpResponse, HttpResponsePermanentRedirect
 from django.template import loader
 from django.shortcuts import get_object_or_404
+from django.conf import settings
+
 from ietf.idtracker.models import Acronym, IETFWG, InternetDraft, IDInternal,PersonOrOrgInfo, Area
 from ietf.idtracker.templatetags.ietf_filters import clean_whitespace
 import re
@@ -156,13 +158,21 @@ def test_id_abstracts_txt(request):
 
 def redirect_id(request, object_id):
     '''Redirect from historical document ID to preferred filename url.'''
+    if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+        return HttpResponsePermanentRedirect("/doc/")
+
     doc = get_object_or_404(InternetDraft, id_document_tag=object_id)
     return HttpResponsePermanentRedirect("/doc/"+doc.filename+"/")
 
 def redirect_filename(request, filename):
     return HttpResponsePermanentRedirect("/doc/"+filename+"/")
 
 def wgdocs_redirect_id(request, id):
+    if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+        from group.models import Group
+        group = get_object_or_404(Group, id=id)
+        return HttpResponsePermanentRedirect("/wg/%s/" % group.acronym)
+
     group = get_object_or_404(Acronym, acronym_id=id)
     return HttpResponsePermanentRedirect("/wg/"+group.acronym+"/")