lib/my_db.py
author fabien
Sun, 12 Oct 2003 11:11:31 -0400
branchxbelweb
changeset 43 4d194fce51e1
parent 41 7b7cd0e74ee3
child 44 87f94936990d
permissions -rw-r--r--
[svn r1594] Update to use user's preferences.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
a4c49a0c313b [svn r1527] Premi�re version.
fabien
parents:
diff changeset
     1
#!/usr/bin/python
a4c49a0c313b [svn r1527] Premi�re version.
fabien
parents:
diff changeset
     2
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
     3
import pgdb
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
     4
import config
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
     5
from bkmark import Bookmark
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
     6
import os
0
a4c49a0c313b [svn r1527] Premi�re version.
fabien
parents:
diff changeset
     7
12
800be3836f3b [svn r1546] Correctly quote data in SQL.
fabien
parents: 8
diff changeset
     8
def sql_quote(str):
800be3836f3b [svn r1546] Correctly quote data in SQL.
fabien
parents: 8
diff changeset
     9
	return pgdb._quote(str)
800be3836f3b [svn r1546] Correctly quote data in SQL.
fabien
parents: 8
diff changeset
    10
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
    11
class MyDbConnexion:
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    12
	def __init__(self, name):
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
    13
		self.cnx = pgdb.connect(database = config.database,
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
    14
			host = config.host+':%d'%config.port,
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
    15
			user = config.user, password = config.passwd)
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
    16
		self.crs = self.cnx.cursor();
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    17
		self.userid = self.get_user_id(name)
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    18
		if self.userid == None:
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    19
			self.userid = self.create_user(name)
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    20
		else:
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    21
			self.userid = self.userid[0]
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    22
	def get_user_id(self, name):
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    23
		self.crs.execute("""
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    24
			SELECT id FROM users
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    25
			WHERE name = %s;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    26
			""" % (sql_quote(name),))
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    27
		return self.crs.fetchone()
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    28
	def create_user(self, name):
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    29
		id = self.get_next_id('users')
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    30
		self.crs.execute("""
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    31
			INSERT INTO users(id, name)
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    32
			VALUES (%d, %s);
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    33
			""" % (id, sql_quote(name)))
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    34
		self.crs.execute("""
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    35
			INSERT INTO keywords(id, userid, name)
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    36
			VALUES (0, %d, '--');
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    37
			""" %(id,))
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    38
		self.crs.execute("""
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    39
			INSERT INTO db_sequence(seq_name, userid, nextid)
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    40
			VALUES ('keywords', %d, 1);
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    41
			""" %(id,))
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    42
		self.crs.execute("""
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    43
			INSERT INTO db_sequence(seq_name, userid, nextid)
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    44
			VALUES ('bookmarks', %d, 0);
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    45
			""" %(id,))
38
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    46
		self.crs.execute("""
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    47
			INSERT INTO preferences(userid)
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    48
			VALUES (%d);
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    49
			""" %(id,))
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    50
		self.cnx.commit()
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    51
		return id
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    52
	def delete_user(self, userid):
38
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    53
		self.crs.execute("""
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    54
			DELETE FROM users WHERE id = %d;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    55
			DELETE FROM bookmarks_keywords WHERE userid = %d;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    56
			DELETE FROM bookmarks WHERE userid = %d;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    57
			DELETE FROM keywords WHERE userid = %d;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    58
			DELETE FROM db_sequence WHERE userid = %d;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    59
			""" % (userid,userid,userid,userid,userid))
38
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    60
		self.cnx.commit()
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    61
	def get_preferences(self):
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    62
		self.crs.execute("""
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    63
			SELECT keywords_box,
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    64
			keywords_sort, keywords_reverse
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    65
			FROM preferences WHERE userid = %d;
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    66
			""" % (self.userid,))
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    67
		res = self.crs.fetchone()
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    68
		return {
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    69
		   'keywords_box' : res[0],
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    70
		   'keywords_sort' : res[1],
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    71
		   'keywords_reverse': res[2]
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    72
		   }
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    73
	def set_preferences(self, prefs):
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    74
	        if prefs['keywords_reverse']:
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    75
			rev = 'TRUE'
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    76
		else:
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    77
			rev = 'FALSE'
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    78
		self.crs.execute("""
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    79
			UPDATE preferences
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    80
			SET keywords_box = %d,
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    81
			keywords_sort = %s,
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    82
			keywords_reverse = %s
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    83
			WHERE userid = %d;
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    84
			""" % (prefs['keywords_box'],
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    85
			sql_quote(prefs['keywords_sort']),
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    86
			rev, self.userid))
c30e2402deca [svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents: 33
diff changeset
    87
		self.cnx.commit()
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
    88
	def add_bookmark(self, bk):
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
    89
		id = self.get_next_id('bookmarks')
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
    90
		self.crs.execute("""
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    91
			INSERT INTO bookmarks(id, userid, url, name, ldesc, added)
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    92
			VALUES (%d, %d, %s, %s, %s, %s);
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    93
			INSERT INTO bookmarks_keywords(bookmark, keyword, userid)
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    94
			VALUES (%d, 0, %d);
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    95
			""" % (id, self.userid, sql_quote(bk.url),
12
800be3836f3b [svn r1546] Correctly quote data in SQL.
fabien
parents: 8
diff changeset
    96
			sql_quote(bk.name), sql_quote(bk.desc),
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    97
			sql_quote(bk.added),
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
    98
			id, self.userid))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
    99
		self.cnx.commit()
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   100
		return id
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   101
	def get_bookmarks(self, ids):
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   102
		qry = """
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   103
			SELECT id, url, name, ldesc, added
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   104
			FROM bookmarks
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   105
			WHERE userid = %d AND (id = %d
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   106
			""" % (self.userid, ids.pop(),)
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   107
		for id in ids:
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   108
			qry = qry + " OR id = %d" % (id,)
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   109
		qry = qry + ");"
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   110
		self.crs.execute(qry)
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   111
		bks = []
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   112
		list = self.crs.fetchall()
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   113
		for res in list:
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   114
			bk = Bookmark()
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   115
			bk.id = res[0]
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   116
			bk.url = res[1]
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   117
			bk.name = res[2]
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   118
			bk.desc = res[3]
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   119
			bk.added = res[4]
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   120
			bks.append(bk)
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   121
		return bks
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   122
	def update_bookmark(self, bk):
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   123
		self.crs.execute("""
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   124
			UPDATE bookmarks
12
800be3836f3b [svn r1546] Correctly quote data in SQL.
fabien
parents: 8
diff changeset
   125
			SET url = %s, name = %s,
800be3836f3b [svn r1546] Correctly quote data in SQL.
fabien
parents: 8
diff changeset
   126
			ldesc = %s, added = %s
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   127
			WHERE userid = %d AND id = %d;
15
574631f841c3 [svn r1549] Add update/merge/delete keywords.
fabien
parents: 13
diff changeset
   128
			""" % (sql_quote(bk.url), sql_quote(bk.name),
12
800be3836f3b [svn r1546] Correctly quote data in SQL.
fabien
parents: 8
diff changeset
   129
			sql_quote(bk.desc),
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   130
			sql_quote(bk.added), self.userid, bk.id))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   131
		self.cnx.commit()
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   132
	def update_keywords(self, id, keywords):
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   133
		self.crs.execute("""
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   134
			DELETE FROM bookmarks_keywords
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   135
			WHERE userid = %d AND bookmark = %d AND
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   136
			keyword <> 0;""" % (self.userid, id))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   137
		for kw in keywords:
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   138
			if kw == 0: continue
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   139
			self.crs.execute("""
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   140
				INSERT INTO
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   141
				bookmarks_keywords(bookmark, keyword, userid)
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   142
				VALUES (%d, %d, %d);""" % (id, kw, self.userid))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   143
		self.cnx.commit()	
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   144
	def remove_bookmark(self, id):
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   145
		self.crs.execute("""
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   146
			DELETE FROM bookmarks_keywords
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   147
			WHERE userid = %d AND bookmark = %d;
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   148
			DELETE FROM bookmarks
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   149
			WHERE userid = %d AND id = %d;
23
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   150
			""" % (self.userid, id, self.userid, id))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   151
		self.cnx.commit()
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   152
	def add_keyword(self, name):
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   153
		id = self.get_next_id('keywords')
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   154
		self.crs.execute("""
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   155
			INSERT INTO keywords(id, userid, name)
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   156
			VALUES (%d, %d, %s);
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   157
			""" % (id, self.userid, sql_quote(name)))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   158
		self.cnx.commit()
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   159
		return id
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   160
	def get_keyword(self, id):
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   161
		self.crs.execute("""
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   162
			SELECT name FROM keywords
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   163
			WHERE userid = %d AND id = %d;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   164
			""" % (self.userid, id))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   165
		return self.crs.fetchone()[0]
33
db91081e5a78 [svn r1577] Various change to the new interface.
fabien
parents: 26
diff changeset
   166
	def get_keywords(self, bk_ids):
db91081e5a78 [svn r1577] Various change to the new interface.
fabien
parents: 26
diff changeset
   167
		if len(bk_ids) == 0:
db91081e5a78 [svn r1577] Various change to the new interface.
fabien
parents: 26
diff changeset
   168
			return []
db91081e5a78 [svn r1577] Various change to the new interface.
fabien
parents: 26
diff changeset
   169
		qry = """
db91081e5a78 [svn r1577] Various change to the new interface.
fabien
parents: 26
diff changeset
   170
			SELECT DISTINCT k.id, k.name
23
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   171
			FROM keywords k, bookmarks_keywords bk
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   172
			WHERE bk.userid = %d
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   173
			AND k.userid = %d
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   174
			AND k.id = bk.keyword
33
db91081e5a78 [svn r1577] Various change to the new interface.
fabien
parents: 26
diff changeset
   175
			AND (
db91081e5a78 [svn r1577] Various change to the new interface.
fabien
parents: 26
diff changeset
   176
			""" % (self.userid, self.userid)
db91081e5a78 [svn r1577] Various change to the new interface.
fabien
parents: 26
diff changeset
   177
		for id in bk_ids:
41
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   178
			qry += "bk.bookmark = %d OR " % (id,)
33
db91081e5a78 [svn r1577] Various change to the new interface.
fabien
parents: 26
diff changeset
   179
		qry = qry[:-3] + ") ORDER BY k.id;"
db91081e5a78 [svn r1577] Various change to the new interface.
fabien
parents: 26
diff changeset
   180
		self.crs.execute(qry)
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   181
		return self.crs.fetchall()
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   182
	def update_keyword(self, id, name):
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   183
		self.crs.execute("""
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   184
			UPDATE keywords
12
800be3836f3b [svn r1546] Correctly quote data in SQL.
fabien
parents: 8
diff changeset
   185
			SET name = %s
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   186
			WHERE userid = %d AND id = %d;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   187
			""" % (sql_quote(name), self.userid, id))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   188
		self.cnx.commit()
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   189
	def remove_keyword(self, id):
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   190
		if id == 0:
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   191
			raise "Can't remove default keyword!"
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   192
		self.crs.execute("""
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   193
			DELETE FROM bookmarks_keywords
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   194
			WHERE keyword = %d AND userid = %d;
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   195
			DELETE FROM keywords
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   196
			WHERE id = %d AND userid = %d;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   197
			""" % (id, self.userid, id, self.userid))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   198
		self.cnx.commit()
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   199
	def merge_keywords(self, merge_id, into_id):
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   200
		self.crs.execute("""
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   201
			UPDATE bookmarks_keywords
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   202
			SET keyword = %d
15
574631f841c3 [svn r1549] Add update/merge/delete keywords.
fabien
parents: 13
diff changeset
   203
			WHERE keyword = %d
23
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   204
			AND userid = %d
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   205
			AND bookmark NOT IN 
15
574631f841c3 [svn r1549] Add update/merge/delete keywords.
fabien
parents: 13
diff changeset
   206
			  (SELECT bookmark FROM bookmarks_keywords
26
17b0cd274530 [svn r1560] Add import functionality and correct a bug in the merge_kw.
fabien
parents: 23
diff changeset
   207
			  WHERE userid = %d AND keyword = %d )
15
574631f841c3 [svn r1549] Add update/merge/delete keywords.
fabien
parents: 13
diff changeset
   208
			;
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   209
			""" % (into_id, merge_id, self.userid,
26
17b0cd274530 [svn r1560] Add import functionality and correct a bug in the merge_kw.
fabien
parents: 23
diff changeset
   210
			self.userid, into_id))
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   211
		self.remove_keyword(merge_id)
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   212
	def get_all_keywords(self):
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   213
		"""Return a list of doublets [id, keyword, count]."""
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   214
		self.crs.execute("""SELECT k.id, k.name
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   215
			FROM keywords k
23
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   216
			WHERE k.userid = %d
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   217
			ORDER BY k.id;""" % (self.userid,))
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   218
		res = self.crs.fetchall()
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   219
		return res
41
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   220
	def get_keywords_count(self, bks = []):
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   221
		"""Return a list of doublets [id, count].
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   222
Does with a count of zero are ignored."""
41
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   223
		qry = """SELECT bk.keyword, COUNT(bk.keyword)
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   224
			FROM bookmarks_keywords bk
41
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   225
			WHERE bk.userid = %d""" % (self.userid,)
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   226
		if len(bks) > 0:
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   227
			qry += " AND ( bk.bookmark = %d" % bks[0]
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   228
			for bk in bks[1:]:
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   229
				qry += " OR bk.bookmark = %d" % bk
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   230
			qry += " )"
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   231
		qry += " GROUP BY bk.keyword ORDER BY bk.keyword;"
7b7cd0e74ee3 [svn r1585] Restrict keywords count to selection.
fabien
parents: 38
diff changeset
   232
		self.crs.execute(qry)
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   233
		res = self.crs.fetchall()
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   234
		if not res:
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   235
			res = [[0,0]]
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   236
		return res
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   237
	def select_bookmarks(self, has_kw = [0], except_kw = []):
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   238
	        """
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   239
Return a list of id bookmarks who has /has_kw/ set but not /except_kw/.
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   240
"""
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   241
		basic_qry = """
23
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   242
		  SELECT bk.bookmark FROM bookmarks_keywords bk
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   243
		  WHERE bk.keyword = %d
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   244
		  AND bk.userid = %d
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   245
		  """
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   246
		
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   247
		qry = basic_qry % (has_kw[0], self.userid)
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   248
		for kw in has_kw[1:]:
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   249
			qry = qry + ("INTERSECT " + basic_qry % (kw, self.userid))
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   250
		for kw in except_kw:
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   251
			qry = qry + ("EXCEPT " + basic_qry % (kw, self.userid))
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   252
		qry = qry + ';'
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   253
		self.crs.execute(qry)
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   254
		return self.crs.fetchall()
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   255
	def get_next_id(self, seq_name):
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   256
		if seq_name == 'users':
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   257
			userid = -1
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   258
		else:
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   259
			userid = self.userid
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   260
		self.crs.execute("""
23
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   261
			SELECT nextid FROM db_sequence
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   262
			WHERE seq_name = '%s'
69c1f93892dd [svn r1557] Correct some errors for multi-user support.
fabien
parents: 21
diff changeset
   263
			AND userid = %d
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   264
			FOR UPDATE;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   265
			""" % (seq_name,userid))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   266
		id = self.crs.fetchone()[0]
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   267
		self.crs.execute("""
2
4cb6d9f3d3eb [svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents: 0
diff changeset
   268
			UPDATE db_sequence SET nextid = %d
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   269
			WHERE seq_name = '%s'
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   270
			AND userid = %d;
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   271
			""" % (id+1, seq_name, userid))
3
9e7e8b678819 [svn r1530] Add and browse working.
fabien
parents: 2
diff changeset
   272
		return id
0
a4c49a0c313b [svn r1527] Premi�re version.
fabien
parents:
diff changeset
   273
21
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   274
def connect(username):
345ee7421989 [svn r1555] Add multiuser support and more templating.
fabien
parents: 15
diff changeset
   275
	return MyDbConnexion(username)