--- a/add_result.py	Fri Oct 24 14:19:30 2003 -0400
+++ b/add_result.py	Fri Oct 24 17:04:29 2003 -0400
@@ -11,13 +11,12 @@
 
 # import cgitb; cgitb.enable()
 import cgi
-from htmltmpl import TemplateManager
-from webutils import get_template_processor
+from templates import Template
 import time
 from utils import unique
 import my_db
 from add_confirm import get_bk_from_form, get_new_kw_from_form
-from index import load_index
+from webutils import load_index
 import os
 
 def add_new_keywords(db, newkw):
@@ -33,24 +32,24 @@
     return kw
 
 def main(bk, kw, prefs):
-    tmpl = TemplateManager().prepare("add_result.tmpl")
-    tproc = get_template_processor(prefs)
-    tproc.set("url", bk.url)
-    tproc.set("name", bk.name)
-    tproc.set("added", bk.added)
-    tproc.set("desc", bk.desc)
-    tproc.set("Keywords", kw)
-    print tproc.process(tmpl)
+    tmpl = Template("add_result.tmpl", prefs)
+    tmpl.set("url", bk.url)
+    tmpl.set("name", bk.name)
+    tmpl.set("added", bk.added)
+    tmpl.set("desc", bk.desc)
+    tmpl.set("Keywords", kw)
+    print tmpl.process()
 
 if (__name__ == "__main__"):
     form = cgi.FieldStorage()
     db = my_db.connect(os.environ["REMOTE_USER"])
+    prefs = db.get_preferences()
     action = form['action'].value
     if action == 'cancel':
-      load_index(db)
+      load_index(db, prefs)
     elif action == 'delete':
       db.remove_bookmark(int(form['id'].value))
-      load_index(db)
+      load_index(db, prefs)
     else:
       bk = get_bk_from_form(form)
       newkw = get_new_kw_from_form(form)
@@ -62,4 +61,4 @@
 	id = bk.id
       db.update_keywords(id, kw)
       kw = map(lambda e: { 'keyword': e[1] }, db.get_keywords([id])[1:])
-      main(bk, kw, db.get_preferences())
+      main(bk, kw, prefs)