diff -r 800536f34f15 -r 4cb6d9f3d3eb lib/bkmark.py
--- a/lib/bkmark.py	Tue Sep 23 10:26:16 2003 -0400
+++ b/lib/bkmark.py	Tue Sep 23 10:26:35 2003 -0400
@@ -8,39 +8,5 @@
 		self.name = ''
 		self.desc = ''
 		self.added = time.strftime('%Y-%m-%d')
-	def add_to_db(self, cnx):
-		id = cnx.query("""
-			SELECT nextid FROM db_sequence WHERE
-			db_sequence.seq_name = 'bookmarks';
-			""").getresult()[0][0]
-		res = cnx.query("""
-			INSERT INTO bookmarks(id, url, name, ldesc, added)
-			VALUES (%d, '%s', '%s', '%s', '%s');
-			""" % (id, self.url, self.name, self.desc,
-			self.added))
-		cnx.query("""
-			UPDATE db_sequence SET nextid = %d
-			WHERE seq_name = 'bookmarks';
-			""" % (id+1,))
-		return res
 
-def get_from_form(form):
-	bk = Bookmark()
-	bk.url = form["url"].value
-	bk.name = form["name"].value
-	bk.desc = form["desc"].value
-	return bk
 
-def get_from_id(cnx, id):
-	bk = Bookmark()
-	res = cnx.query("""
-		SELECT url, name, ldesc, added
-		FROM bookmarks
-		WHERE id = %d;
-		""" % (id,))
-	res = res.dictresult()[0]
-	bk.url = res['url']
-	bk.name = res['name']
-	bk.desc = res['ldesc']
-	bk.added = res['added']
-	return bk