big commit with db and cgi handling updates

i know it's bad form to lump this all together.  oh well :p

gen-patch-info now does very little besides processing packages
and updating the relevant database entries.  pretty much everything
else is dynamically generated from pagehandler.py now.

1 files changed, 6 insertions, 17 deletions

diff --git a/patchtracker/Writers.py b/patchtracker/Writers.py
index 7e2fd1c..c3b59aa 100755
--- a/patchtracker/Writers.py
+++ b/patchtracker/Writers.py
@@ -23,8 +23,8 @@ class PackageVersTemplate(OurTemplate):
     self.suite = suite
     tpl=os.sep.join([Conf.template_dir, "package_vers.tmpl"])
     sl = {}
-    if srcpkg.diffgz:
-      dfile = os.sep.join([Conf.archive_root,srcpkg.loc,srcpkg.diffgz['name']])
+    if srcpkg.diffgz_name:
+      dfile = os.sep.join([Conf.archive_root,srcpkg.loc,srcpkg.diffgz_name])
       sl['diffhandler'] = DiffGzHandler(dfile)
     else:
       sl['diffhandler'] = None
@@ -34,20 +34,12 @@ class FrontPageTemplate(OurTemplate):
   allindex = None
   relindices = []
 
-  def __init__(self, allindex, release_indices=[]):
+  def __init__(self, allindex):
     tpl = os.sep.join([Conf.template_dir, "frontpage.tmpl"])
     OurTemplate.__init__(self, file=tpl)
     self.allindex = allindex
-    self.relindices = release_indices
 
 class LetterTocTemplate(OurTemplate):
-  idx = None
-  pkgs = None
-  dists = None
-
-  def releases(self):
-    return dists
-
   def __init__(self, letter, collection):
     self.pkgs = collection
     self.idx = letter
@@ -58,6 +50,9 @@ class LetterTocTemplate(OurTemplate):
     tpl = os.sep.join([Conf.template_dir, "letter_toc.tmpl"])
     OurTemplate.__init__(self, file=tpl)
 
+  def releases(self):
+    return dists
+
 class ErrorTemplate(OurTemplate):
   def __init__(self, msg):
     tpl = os.sep.join([Conf.template_dir, "cgi_error.tmpl"])
@@ -97,9 +92,3 @@ class FrontPageWriter(PageWriter):
     t = FrontPageTemplate(allindex, release_indices)
     dest = os.sep.join([Conf.output_dir, "index.html"])
     PageWriter.__init__(self, dest, t)
-
-class LetterTocWriter(PageWriter):
-  def __init__(self, letter, collection):
-    t = LetterTocTemplate(letter, collection)
-    dest = os.sep.join([Conf.output_dir, "index", t.idx, "index.html"])
-    PageWriter.__init__(self, dest, t)