new ReleaseList class to order project releases

4 files changed, 19 insertions, 11 deletions

diff --git a/patchtracker/SourceArchive.py b/patchtracker/SourceArchive.py
index 832b315..099b506 100755
--- a/patchtracker/SourceArchive.py
+++ b/patchtracker/SourceArchive.py
@@ -144,6 +144,18 @@ class SourcePackageIndex:
   def indices(self):
     return sorted(self.pkgs.iterkeys())
 
+class ReleaseList:
+
+  def __init__(self, project):
+    self.project = project
+    # XXX this is hard coded for now...
+    self.relorder = {}
+    self.relorder["debian"] = ["etch", "lenny", "sid", "experimental"]
+
+  def __iter__(self):
+    for r in self.relorder[self.project]:
+      yield r
+
 # basic module tests
 if __name__ == "__main__":
   import Conf
diff --git a/patchtracker/Templates.py b/patchtracker/Templates.py
index b940670..89f7471 100755
--- a/patchtracker/Templates.py
+++ b/patchtracker/Templates.py
@@ -1,5 +1,6 @@
 from patchtracker import Conf
 from patchtracker.DiffGzHandler import DiffGzHandler
+from patchtracker.SourceArchive import ReleaseList
 
 from Cheetah.Template import Template
 from Cheetah.Compiler import Compiler
@@ -48,10 +49,7 @@ class LetterTocTemplate(OurTemplate):
   def __init__(self, letter, collection):
     self.pkgs = collection
     self.idx = letter
-    self.dists = {}
-    for name,packagelist in collection.iteritems():
-      for d in packagelist.iterkeys():
-        self.dists[d] = True
+    self.dists = ReleaseList("debian")
     sl = {}
     sl['crumbs'] = [("index/"+letter,"index for "+letter)]
     tpl = os.sep.join([Conf.template_dir, "letter_toc.tmpl"])
@@ -61,12 +59,10 @@ class SearchResultsTemplate(OurTemplate):
   def __init__(self, search, collection):
     self.pkgs = {}
     self.idx = search
-    self.dists = {}
+    self.dists = ReleaseList("debian")
     for idx in collection.indices():
       for name,packagelist in collection.getletter(idx).iteritems():
         self.pkgs[name] = packagelist
-        for d in packagelist.iterkeys():
-          self.dists[d] = True
     tpl = os.sep.join([Conf.template_dir, "searchresults.tmpl"])
     OurTemplate.__init__(self, file=tpl)
 
diff --git a/templates/letter_toc.tmpl b/templates/letter_toc.tmpl
index 64e5317..8d60cc6 100644
--- a/templates/letter_toc.tmpl
+++ b/templates/letter_toc.tmpl
@@ -9,7 +9,7 @@ Debian Project patch tracking system
 <table class="packagelisting">
 <tr>
 <th>package</th>
-#for $d in $dists.iterkeys()
+#for $d in $dists
  <th>$d</th>
 #end for
 </tr>
@@ -19,7 +19,7 @@ Debian Project patch tracking system
   <a name="$escape_name($p)" />
   <a href="http://packages.debian.org/$p">$p</a>
  </td>
- #for $d in $dists.iterkeys()
+ #for $d in $dists
   <td>
   #if $pkgs[$p].has_key($d)
    <a href="$conf.root_url/package/$p/$pkgs[$p][$d].version">$pkgs[$p][$d].version</a>
diff --git a/templates/searchresults.tmpl b/templates/searchresults.tmpl
index 9768d45..d8fb8ef 100644
--- a/templates/searchresults.tmpl
+++ b/templates/searchresults.tmpl
@@ -9,7 +9,7 @@ Debian Project patch tracking system - Search Results
 <table class="packagelisting">
 <tr>
 <th>package</th>
-#for $d in $dists.iterkeys()
+#for $d in $dists
  <th>$d</th>
 #end for
 </tr>
@@ -19,7 +19,7 @@ Debian Project patch tracking system - Search Results
   <a name="$p" />
   <a href="http://packages.debian.org/$p">$p</a>
  </td>
- #for $d in $dists.iterkeys()
+ #for $d in $dists
   <td>
   #if $pkgs[$p].has_key($d)
    <a href="$conf.root_url/package/$p/$pkgs[$p][$d].version">$pkgs[$p][$d].version</a>