More robust error handling in search, fix the urls tests to reflect the new schema

 - Legacy-Id: 2871

Author: OleLaursen

ietf/idrfc/testsREDESIGN.py

@@ -53,7 +53,8 @@
 
 class IdRfcUrlTestCase(SimpleUrlTestCase):
     def testUrls(self):
-        self.doTestUrls(__file__)
+        #self.doTestUrls(__file__)
+        self.doTestUrls(os.path.join(os.path.dirname(os.path.abspath(__file__)), "testurlREDESIGN.list"))
 
 def make_test_data():
     # groups

ietf/idrfc/testurlREDESIGN.list

@@ -0,0 +1,88 @@
+200	/
+200	/doc/
+200,heavy /doc/all/
+200,heavy /doc/active/
+
+# draft that's now RFC
+200	/doc/draft-ietf-avt-rtp-atrac-family/
+200	/doc/draft-ietf-avt-rtp-atrac-family/doc.json
+200	/doc/draft-ietf-avt-rtp-atrac-family/ballot.json
+200	/doc/draft-ietf-avt-rtp-atrac-family/_ballot.data
+
+# replaced draft, never went to IESG
+200	/doc/draft-eronen-mobike-mopo/
+404	/doc/draft-eronen-mobike-mopo/ballot.json
+404	/doc/draft-eronen-mobike-mopo/_ballot.data
+
+# expired draft
+200 	/doc/draft-eronen-eap-sim-aka-80211/
+
+# Normal RFC 
+200	/doc/rfc4739/
+200	/doc/rfc4739/doc.json
+200	/doc/rfc4739/ballot.json # has ballot from I-D
+200	/doc/rfc4739/_ballot.data
+
+# RFC that's evaluated in IESG
+200	/doc/rfc3852/
+200	/doc/rfc3852/doc.json
+200	/doc/rfc3852/ballot.json
+200	/doc/rfc3852/_ballot.data
+
+# old RFC
+200     /doc/rfc822/
+200     /doc/rfc822/doc.json
+
+# ballot sets
+200	 /doc/rfc3550/ballot.json
+200	 /doc/rfc3550/_ballot.data
+200	 /doc/rfc3551/ballot.json
+200	 /doc/rfc3551/_ballot.data
+200	 /doc/draft-irtf-dtnrg-ltp/ballot.json
+200	 /doc/draft-irtf-dtnrg-ltp/_ballot.data
+
+# file formats
+200     /doc/rfc9/ # PDF only
+200	/doc/rfc2490/ # TXT+PDF+PS
+200	/doc/rfc500/ # not online
+
+404	/doc/draft-no-such-draft/
+404	/doc/rfc4637/
+
+200	/doc/rfc2444/doc.json   # foreignkey problem with Django 1.x
+
+# current AD -- needs to be updated at some point
+200	/doc/ad/robert.sparks/
+# former AD
+200	/doc/ad/sam.hartman/
+404	/doc/ad/no.body/
+
+# ballot exists, but it's not issued
+404	/doc/draft-ietf-aaa-diameter-api/ballot.json
+404	/doc/draft-ietf-aaa-diameter-api/_ballot.data
+# ballot does not exist
+404	/doc/draft-zeilenga-cldap/ballot.json
+404	/doc/draft-zeilenga-cldap/_ballot.data
+# comment with created_by=999
+200	/doc/draft-ietf-l3vpn-2547bis-mcast-bgp/
+# comment with created_by=0 (and no idinternal entry)
+200	/doc/draft-ietf-proto-wgdocument-states/
+
+200	/doc/search/
+200	/doc/search/?rfcs=on&name=snmp
+200	/doc/search/?rfcs=on&name=nfs&by=ad&ad=lars.eggert%40nokia.com
+200	/doc/search/?activeDrafts=on&name=sipping
+200	/doc/search/?oldDrafts=on&name=tls
+200	/doc/search/?activeDrafts=on&oldDrafts=on&ad=lars.eggert%40nokia.com&by=ad
+200	/doc/search/?activeDrafts=on&state=iesg-eva&by=state
+200	/doc/search/?activeDrafts=on&oldDrafts=on&subState=need-rev&by=state
+200	/doc/search/?activeDrafts=on&oldDrafts=on&rfcs=on&ad=lars.eggert%40nokia.com&name=nfs&by=ad
+200	/doc/search/?rfcs=on&group=tls&by=group
+200	/doc/search/?activeDrafts=on&group=tls&by=group
+200	/doc/search/?activeDrafts=on&oldDrafts=on&rfcs=on&author=eronen&by=author
+200	/doc/search/?activeDrafts=on&oldDrafts=on&rfcs=on&area=178&name=ldap&by=area
+200	/doc/search/?activeDrafts=on&name=asdfsadfsdfasdf
+200	/doc/search/?activeDrafts=on&name=%EF%BD%8C #non-ASCII
+
+# Test case for missing publication date
+200	/doc/search/?oldDrafts=on&name=ppvpn

ietf/idrfc/views_search.py

@@ -38,7 +38,7 @@
 from django.views.decorators.cache import cache_page
 from ietf.idtracker.models import IDState, IESGLogin, IDSubState, Area, InternetDraft, Rfc, IDInternal, IETFWG
 from ietf.idrfc.models import RfcIndex
-from django.http import Http404, HttpResponse, HttpResponsePermanentRedirect
+from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponsePermanentRedirect
 from ietf.idrfc.idrfc_wrapper import IdWrapper,RfcWrapper,IdRfcWrapper
 from ietf.utils import normalize_draftname
 from django.conf import settings
@@ -296,9 +296,9 @@ def clean(self):
             q = self.cleaned_data
             # Reset query['by'] if needed
             for k in ('author','group','area','ad'):
-                if (q['by'] == k) and not q[k]:
+                if (q['by'] == k) and (k not in q or not q[k]):
                     q['by'] = None
-            if (q['by'] == 'state') and not (q['state'] or q['subState']):
+            if (q['by'] == 'state') and (not 'state' in q or not 'subState' in q or not (q['state'] or q['subState'])):
                 q['by'] = None
             # Reset other fields
             for k in ('author','group','area','ad'):
@@ -456,7 +456,7 @@ def search_results(request):
         return search_main(request)
     form = SearchForm(dict(request.REQUEST.items()))
     if not form.is_valid():
-        return HttpResponse("form not valid?", mimetype="text/plain")
+        return HttpResponseBadRequest("form not valid?", mimetype="text/plain")
     (results,meta) = search_query(form.cleaned_data)
     meta['searching'] = True
     meta['by'] = form.cleaned_data['by']