--- a/add_confirm.py	Fri Oct 24 14:19:30 2003 -0400
+++ b/add_confirm.py	Fri Oct 24 17:04:29 2003 -0400
@@ -13,12 +13,11 @@
 
 # import cgitb; cgitb.enable()
 import cgi
-from htmltmpl import TemplateManager
-from webutils import get_template_processor
 import my_db
 import time
 from bkmark import Bookmark
-from index import load_index
+from webutils import load_index
+from templates import Template
 from utils import unique
 import os
 
@@ -58,24 +57,24 @@
       return kw
 
 def main(action, bk, kw, prefs):
-    tmpl = TemplateManager().prepare("add_confirm.tmpl")
-    tproc = get_template_processor(prefs)
-    tproc.set("confirm_delete", action == 'delete')
-    tproc.set("confirm_update", action == 'update')
-    tproc.set("action", action)
-    tproc.set("id", bk.id)
-    tproc.set("name", bk.name)
-    tproc.set("url", bk.url)
-    tproc.set("Keywords", map(lambda x: {'keyword': x }, kw))
-    print tproc.process(tmpl)
+    tmpl = Template("add_confirm.tmpl", prefs)
+    tmpl.set("confirm_delete", action == 'delete')
+    tmpl.set("confirm_update", action == 'update')
+    tmpl.set("action", action)
+    tmpl.set("id", bk.id)
+    tmpl.set("name", bk.name)
+    tmpl.set("url", bk.url)
+    tmpl.set("Keywords", map(lambda x: {'keyword': x }, kw))
+    print tmpl.process()
 
 if (__name__ == "__main__"):
     form = cgi.FieldStorage()
     db = my_db.connect(os.environ["REMOTE_USER"])
+    prefs = db.get_preferences()
     id = int(form['id'].value)
     action = form['action'].value
     if action == 'cancel' or (action == 'delete' and id == -1):
-        load_index(db)
+        load_index(db, prefs)
     else:
 	if action == 'update':
 	  bk = get_bk_from_form(form)
@@ -84,5 +83,5 @@
 	  bk = db.get_bookmarks([id])[0]
 	  (ids, kw) = apply(zip,db.get_keywords([id]))
 	  kw = kw[1:]
-	main(action, bk, kw, db.get_preferences())
+	main(action, bk, kw, prefs)