better output for searches, email query fix

3 files changed, 7 insertions, 5 deletions

diff --git a/pagehandler.py b/pagehandler.py
index ffb5a6c..639ac04 100755
--- a/pagehandler.py
+++ b/pagehandler.py
@@ -89,7 +89,8 @@ class PackageCmd:
       print "Content-Type: text/html\n\n"
       # if there is no match, or if multiple versions were returned
       if not p or len(set(map(lambda x: x.version, p.values()))) > 1:
-        print SearchResultsTemplate(self.name, self.toc)
+        querydesc = "package name contains"
+        print SearchResultsTemplate(self.name, querydesc, self.toc)
       else:
         print PackageVersTemplate(p.popitem()[1])
 
@@ -114,11 +115,11 @@ class MaintCmd:
     else:
       self.db = PatchTrackerDB()
       self.email = args[0]
-      self.toc = self.db.findCollection(email="%"+self.email+"%")
+      self.toc = self.db.findCollection(email=self.email)
 
   def output(self):
     print "Content-Type: text/html\n\n"
-    print SearchResultsTemplate(self.email, self.toc)
+    print SearchResultsTemplate(self.email, "maintainer email", self.toc)
 
 class JumpCmd:
   def __init__(self):
diff --git a/patchtracker/Templates.py b/patchtracker/Templates.py
index 89f7471..bc6f5f3 100755
--- a/patchtracker/Templates.py
+++ b/patchtracker/Templates.py
@@ -56,9 +56,10 @@ class LetterTocTemplate(OurTemplate):
     OurTemplate.__init__(self, file=tpl, searchList=sl)
 
 class SearchResultsTemplate(OurTemplate):
-  def __init__(self, search, collection):
+  def __init__(self, search, searchtype, collection):
     self.pkgs = {}
     self.idx = search
+    self.searchtype = searchtype
     self.dists = ReleaseList("debian")
     for idx in collection.indices():
       for name,packagelist in collection.getletter(idx).iteritems():
diff --git a/templates/searchresults.tmpl b/templates/searchresults.tmpl
index d8fb8ef..76bf5ff 100644
--- a/templates/searchresults.tmpl
+++ b/templates/searchresults.tmpl
@@ -5,7 +5,7 @@ Debian Project patch tracking system - Search Results
 #end def
 #def body
 <h1>Debian Project patch tracking system</h1>
-<h2>Search Results - $idx</h2>
+<h2>Search Results - $searchtype: $idx</h2>
 <table class="packagelisting">
 <tr>
 <th>package</th>