kw_result.py
branchxbelweb
changeset 17 14bec94bbe89
parent 15 574631f841c3
child 21 345ee7421989
--- a/kw_result.py	Fri Sep 26 11:03:02 2003 -0400
+++ b/kw_result.py	Fri Sep 26 11:04:15 2003 -0400
@@ -15,7 +15,7 @@
 import my_db
 from os import environ
 from urlparse import urljoin
-from index import set_selection, get_curl, main
+from index import load_index
 
 def do_merge(form, db):
 	fromid = int(form['id'].value)	
@@ -41,14 +41,4 @@
 	do_update(form, db)
     elif action == 'delete':
     	do_delete(form, db)
-    keywords = db.get_all_keywords()
-    total = keywords[0][2]
-    keywords = keywords[1:]
-    exc = map(lambda e: int(e[0]), keywords)
-    bookmarks = db.select_bookmarks([0], exc)
-    keywords = set_selection(keywords, [])
-    if len(bookmarks) > 0:
-    	bookmarks = db.get_bookmarks(map(lambda x: x[0], bookmarks))
-    bookmarks = map(lambda bk: bk.dict(), bookmarks)
-    curl = get_curl();
-    main(bookmarks, keywords, curl, total)
+    load_index(db)