Refactoring out draft_search(), and tweaking the IPR doc result template.

 - Legacy-Id: 782

Author: levkowetz

ietf/ipr/search.py

@@ -9,7 +9,7 @@
 from ietf.idtracker.models import IETFWG, InternetDraft, Rfc
 from ietf.ipr.models import IprRfc, IprDraft, IprDetail
 from ietf.ipr.related import related_docs
-from ietf.utils import log
+from ietf.utils import log, draft_search
 
 
 def mark_last_doc(iprs):
@@ -80,20 +80,15 @@ def search(request, type="", q="", id=""):
             # Search by RFC number or draft-identifier
             # Document list with IPRs
             if type in ["document_search", "rfc_search"]:
+                doc = q
                 if type == "document_search":
                     if q:
-                        # normalize the draft name.
-                        q = q.strip()
-                        q = re.sub("\.txt$","",q)
-                        q = re.sub("-\d\d$","",q)
-                        start = InternetDraft.objects.filter(filename__contains=q)
+                        start = draft_search(q)
                     if id:
                         start = InternetDraft.objects.filter(id_document_tag=id)
-                    doc = q
                 if type == "rfc_search":
                     if q:
                         start = Rfc.objects.filter(rfc_number=q)
-                        doc = "RFC%04d" % int(q)
                 if start.count() == 1:
                     first = start[0]
                     doc = str(first)
@@ -102,10 +97,10 @@ def search(request, type="", q="", id=""):
                     docs = related_docs(first, [])
                     #docs = get_doclist.get_doclist(first)
                     iprs, docs = iprs_from_docs(docs)
-                    return render("ipr/search_doc_result.html", {"q": q, "first": first, "docs": docs, "doc": doc },
+                    return render("ipr/search_doc_result.html", {"q": q, "first": first, "iprs": iprs, "docs": docs, "doc": doc },
                                   context_instance=RequestContext(request) )
                 elif start.count():
-                    return render("ipr/search_doc_list.html", {"q": q, "docs": start, "doc": doc  },
+                    return render("ipr/search_doc_list.html", {"q": q, "docs": start },
                                   context_instance=RequestContext(request) )                        
                 else:
                     return render("ipr/search_doc_result.html", {"q": q, "first": {}, "iprs": {}, "docs": {}, "doc": doc },

ietf/templates/ipr/search_doc_result.html

@@ -7,7 +7,7 @@
 	       {% if not iprs %}
 		  <tr>
 		     <td></td>
-		     <td colspan="2"><b>{% block search_failed %}No IPR disclosures were found related to <i>{{ doc }}</i> have been submitted{% endblock %}</b></td>
+		     <td colspan="2"><b>{% block search_failed %}No IPR disclosures were found related to <i>{{ doc }}</i>{% endblock %}</b></td>
 		  </tr>
 	       {% else %}
 		  <tr><td colspan="3">Total number of IPR disclosures found: {{ iprs|length }} </td></tr>

ietf/utils/__init__.py

@@ -5,6 +5,7 @@
 from cache_foreign_key import FKAsOneToOne
 from templated_form import makeTemplatedForm
 from soup2text import TextSoup, soup2text
+from draft_search import draft_search
 
 makeFormattingForm = makeTemplatedForm
 

ietf/utils/draft_search.py

@@ -0,0 +1,14 @@
+# Copyright The IETF Trust 2007, All Rights Reserved
+import re
+from ietf.idtracker.models import InternetDraft
+
+def draft_search(s):
+    drafts = []
+    if s:
+        # normalize the draft name.
+        s = s.strip()
+        s = re.sub("\.txt$","",s)
+        s = re.sub("-\d\d$","",s)
+        drafts = InternetDraft.objects.filter(filename__contains=s)
+    return drafts
+