author | fabien |
Sat, 18 Oct 2003 00:56:42 -0400 | |
branch | xbelweb |
changeset 45 | c81d480c3224 |
parent 44 | 87f94936990d |
child 47 | 2781ac85b807 |
permissions | -rw-r--r-- |
0 | 1 |
#!/usr/bin/python |
2 |
||
3 | 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 | 5 |
from bkmark import Bookmark |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
6 |
import os |
0 | 7 |
|
12 | 8 |
def sql_quote(str): |
9 |
return pgdb._quote(str) |
|
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 | 13 |
self.cnx = pgdb.connect(database = config.database, |
14 |
host = config.host+':%d'%config.port, |
|
15 |
user = config.user, password = config.passwd) |
|
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(""" |
44 | 31 |
INSERT INTO users(id, name, full_name) |
32 |
VALUES (%d, %s, %s); |
|
33 |
""" % (id, sql_quote(name), sql_quote(name))) |
|
21
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(""" |
45
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
47 |
INSERT INTO folders(id, keyword, parent, userid) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
48 |
VALUES (0, 0, -1, %d); |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
49 |
""" %(id,)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
50 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
51 |
INSERT INTO db_sequence(seq_name, userid, nextid) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
52 |
VALUES ('folders', %d, 1); |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
53 |
""" %(id,)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
54 |
self.crs.execute(""" |
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
55 |
INSERT INTO preferences(userid) |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
56 |
VALUES (%d); |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
57 |
""" %(id,)) |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
58 |
self.cnx.commit() |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
59 |
return id |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
60 |
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
|
61 |
self.crs.execute(""" |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
62 |
DELETE FROM users WHERE id = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
63 |
DELETE FROM bookmarks_keywords WHERE userid = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
64 |
DELETE FROM bookmarks WHERE userid = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
65 |
DELETE FROM keywords WHERE userid = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
66 |
DELETE FROM db_sequence WHERE userid = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
67 |
""" % (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
|
68 |
self.cnx.commit() |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
69 |
def get_preferences(self): |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
70 |
self.crs.execute(""" |
44 | 71 |
SELECT p.keywords_box, |
72 |
p.keywords_sort, p.keywords_reverse, |
|
73 |
u.full_name |
|
74 |
FROM preferences p, users u |
|
75 |
WHERE u.id = %d AND p.userid = u.id; |
|
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
76 |
""" % (self.userid,)) |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
77 |
res = self.crs.fetchone() |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
78 |
return { |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
79 |
'keywords_box' : res[0], |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
80 |
'keywords_sort' : res[1], |
44 | 81 |
'keywords_reverse': res[2], |
82 |
'fullname': res[3] |
|
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
83 |
} |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
84 |
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
|
85 |
if prefs['keywords_reverse']: |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
86 |
rev = 'TRUE' |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
87 |
else: |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
88 |
rev = 'FALSE' |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
89 |
self.crs.execute(""" |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
90 |
UPDATE preferences |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
91 |
SET keywords_box = %d, |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
92 |
keywords_sort = %s, |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
93 |
keywords_reverse = %s |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
94 |
WHERE userid = %d; |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
95 |
""" % (prefs['keywords_box'], |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
96 |
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
|
97 |
rev, self.userid)) |
44 | 98 |
self.crs.execute(""" |
99 |
UPDATE users |
|
100 |
SET full_name = %s |
|
101 |
WHERE id = %d; |
|
102 |
""" % (sql_quote(prefs["fullname"]), |
|
103 |
self.userid)) |
|
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
104 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
105 |
def add_bookmark(self, bk): |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
106 |
id = self.get_next_id('bookmarks') |
3 | 107 |
self.crs.execute(""" |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
108 |
INSERT INTO bookmarks(id, userid, url, name, ldesc, added) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
109 |
VALUES (%d, %d, %s, %s, %s, %s); |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
110 |
INSERT INTO bookmarks_keywords(bookmark, keyword, userid) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
111 |
VALUES (%d, 0, %d); |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
112 |
""" % (id, self.userid, sql_quote(bk.url), |
12 | 113 |
sql_quote(bk.name), sql_quote(bk.desc), |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
114 |
sql_quote(bk.added), |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
115 |
id, self.userid)) |
3 | 116 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
117 |
return id |
3 | 118 |
def get_bookmarks(self, ids): |
119 |
qry = """ |
|
120 |
SELECT id, url, name, ldesc, added |
|
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
121 |
FROM bookmarks |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
122 |
WHERE userid = %d AND (id = %d |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
123 |
""" % (self.userid, ids.pop(),) |
3 | 124 |
for id in ids: |
125 |
qry = qry + " OR id = %d" % (id,) |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
126 |
qry = qry + ");" |
3 | 127 |
self.crs.execute(qry) |
128 |
bks = [] |
|
129 |
list = self.crs.fetchall() |
|
130 |
for res in list: |
|
131 |
bk = Bookmark() |
|
132 |
bk.id = res[0] |
|
133 |
bk.url = res[1] |
|
134 |
bk.name = res[2] |
|
135 |
bk.desc = res[3] |
|
136 |
bk.added = res[4] |
|
137 |
bks.append(bk) |
|
138 |
return bks |
|
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
139 |
def update_bookmark(self, bk): |
3 | 140 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
141 |
UPDATE bookmarks |
12 | 142 |
SET url = %s, name = %s, |
143 |
ldesc = %s, added = %s |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
144 |
WHERE userid = %d AND id = %d; |
15 | 145 |
""" % (sql_quote(bk.url), sql_quote(bk.name), |
12 | 146 |
sql_quote(bk.desc), |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
147 |
sql_quote(bk.added), self.userid, bk.id)) |
3 | 148 |
self.cnx.commit() |
149 |
def update_keywords(self, id, keywords): |
|
150 |
self.crs.execute(""" |
|
151 |
DELETE FROM bookmarks_keywords |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
152 |
WHERE userid = %d AND bookmark = %d AND |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
153 |
keyword <> 0;""" % (self.userid, id)) |
3 | 154 |
for kw in keywords: |
155 |
if kw == 0: continue |
|
156 |
self.crs.execute(""" |
|
157 |
INSERT INTO |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
158 |
bookmarks_keywords(bookmark, keyword, userid) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
159 |
VALUES (%d, %d, %d);""" % (id, kw, self.userid)) |
3 | 160 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
161 |
def remove_bookmark(self, id): |
3 | 162 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
163 |
DELETE FROM bookmarks_keywords |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
164 |
WHERE userid = %d AND bookmark = %d; |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
165 |
DELETE FROM bookmarks |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
166 |
WHERE userid = %d AND id = %d; |
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
167 |
""" % (self.userid, id, self.userid, id)) |
3 | 168 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
169 |
def add_keyword(self, name): |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
170 |
id = self.get_next_id('keywords') |
3 | 171 |
self.crs.execute(""" |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
172 |
INSERT INTO keywords(id, userid, name) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
173 |
VALUES (%d, %d, %s); |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
174 |
""" % (id, self.userid, sql_quote(name))) |
3 | 175 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
176 |
return id |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
177 |
def get_keyword(self, id): |
3 | 178 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
179 |
SELECT name FROM keywords |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
180 |
WHERE userid = %d AND id = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
181 |
""" % (self.userid, id)) |
3 | 182 |
return self.crs.fetchone()[0] |
33 | 183 |
def get_keywords(self, bk_ids): |
184 |
if len(bk_ids) == 0: |
|
185 |
return [] |
|
186 |
qry = """ |
|
187 |
SELECT DISTINCT k.id, k.name |
|
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
188 |
FROM keywords k, bookmarks_keywords bk |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
189 |
WHERE bk.userid = %d |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
190 |
AND k.userid = %d |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
191 |
AND k.id = bk.keyword |
33 | 192 |
AND ( |
193 |
""" % (self.userid, self.userid) |
|
194 |
for id in bk_ids: |
|
41 | 195 |
qry += "bk.bookmark = %d OR " % (id,) |
33 | 196 |
qry = qry[:-3] + ") ORDER BY k.id;" |
197 |
self.crs.execute(qry) |
|
3 | 198 |
return self.crs.fetchall() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
199 |
def update_keyword(self, id, name): |
3 | 200 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
201 |
UPDATE keywords |
12 | 202 |
SET name = %s |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
203 |
WHERE userid = %d AND id = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
204 |
""" % (sql_quote(name), self.userid, id)) |
3 | 205 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
206 |
def remove_keyword(self, id): |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
207 |
if id == 0: |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
208 |
raise "Can't remove default keyword!" |
3 | 209 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
210 |
DELETE FROM bookmarks_keywords |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
211 |
WHERE keyword = %d AND userid = %d; |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
212 |
DELETE FROM keywords |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
213 |
WHERE id = %d AND userid = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
214 |
""" % (id, self.userid, id, self.userid)) |
3 | 215 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
216 |
def merge_keywords(self, merge_id, into_id): |
3 | 217 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
218 |
UPDATE bookmarks_keywords |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
219 |
SET keyword = %d |
15 | 220 |
WHERE keyword = %d |
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
221 |
AND userid = %d |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
222 |
AND bookmark NOT IN |
15 | 223 |
(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
|
224 |
WHERE userid = %d AND keyword = %d ) |
15 | 225 |
; |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
226 |
""" % (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
|
227 |
self.userid, into_id)) |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
228 |
self.remove_keyword(merge_id) |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
229 |
def get_all_keywords(self): |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
230 |
"""Return a list of doublets [id, keyword, count].""" |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
231 |
self.crs.execute("""SELECT k.id, k.name |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
232 |
FROM keywords k |
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
233 |
WHERE k.userid = %d |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
234 |
ORDER BY k.id;""" % (self.userid,)) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
235 |
res = self.crs.fetchall() |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
236 |
return res |
41 | 237 |
def get_keywords_count(self, bks = []): |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
238 |
"""Return a list of doublets [id, count]. |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
239 |
Does with a count of zero are ignored.""" |
41 | 240 |
qry = """SELECT bk.keyword, COUNT(bk.keyword) |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
241 |
FROM bookmarks_keywords bk |
41 | 242 |
WHERE bk.userid = %d""" % (self.userid,) |
243 |
if len(bks) > 0: |
|
244 |
qry += " AND ( bk.bookmark = %d" % bks[0] |
|
245 |
for bk in bks[1:]: |
|
246 |
qry += " OR bk.bookmark = %d" % bk |
|
247 |
qry += " )" |
|
248 |
qry += " GROUP BY bk.keyword ORDER BY bk.keyword;" |
|
249 |
self.crs.execute(qry) |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
250 |
res = self.crs.fetchall() |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
251 |
if not res: |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
252 |
res = [[0,0]] |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
253 |
return res |
3 | 254 |
def select_bookmarks(self, has_kw = [0], except_kw = []): |
255 |
""" |
|
256 |
Return a list of id bookmarks who has /has_kw/ set but not /except_kw/. |
|
257 |
""" |
|
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
258 |
basic_qry = """ |
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
259 |
SELECT bk.bookmark FROM bookmarks_keywords bk |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
260 |
WHERE bk.keyword = %d |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
261 |
AND bk.userid = %d |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
262 |
""" |
3 | 263 |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
264 |
qry = basic_qry % (has_kw[0], self.userid) |
3 | 265 |
for kw in has_kw[1:]: |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
266 |
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
|
267 |
for kw in except_kw: |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
268 |
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
|
269 |
qry = qry + ';' |
3 | 270 |
self.crs.execute(qry) |
271 |
return self.crs.fetchall() |
|
45
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
272 |
def get_folder_keyword(self, id): |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
273 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
274 |
SELECT k.id, k.name |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
275 |
FROM keywords k, folders f |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
276 |
WHERE |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
277 |
f.userid = %d AND f.id = %d |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
278 |
AND k.userid = f.userid |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
279 |
AND k.id = f.keyword; |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
280 |
""" %(self.userid, id)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
281 |
return self.crs.fetchone() |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
282 |
def get_subfolders(self, id): |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
283 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
284 |
SELECT f.id, k.id, k.name |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
285 |
FROM folders f, keywords k |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
286 |
WHERE f.userid = %d |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
287 |
AND f.parent = %d |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
288 |
AND k.userid = f.userid |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
289 |
AND k.id = f.keyword |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
290 |
ORDER BY k.name; |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
291 |
""" %(self.userid, id)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
292 |
res = self.crs.fetchall() |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
293 |
return map(lambda e: { |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
294 |
'id' : e[0], |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
295 |
'name' : e[2], |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
296 |
'keyword' : e[1] }, |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
297 |
res) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
298 |
def get_folder_parents_and_self(self, id): |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
299 |
"""Return self and parents in descending order.""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
300 |
if id < 0: |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
301 |
return [] |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
302 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
303 |
SELECT f.id, k.id, k.name, f.parent |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
304 |
FROM folders f, keywords k |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
305 |
WHERE |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
306 |
f.id = %d AND f.userid = %d |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
307 |
AND k.userid = f.userid |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
308 |
AND k.id = f.keyword; |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
309 |
""" %(id, self.userid)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
310 |
cur = self.crs.fetchone() |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
311 |
res = [{ 'id': cur[0], |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
312 |
'name' : cur[2], |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
313 |
'keyword': cur[1] }] |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
314 |
return res + self.get_folder_parents_and_self(cur[3]) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
315 |
def add_folder(self, keyword, parent): |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
316 |
id = self.get_next_id('folders') |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
317 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
318 |
INSERT INTO folders(userid, id, keyword, parent) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
319 |
VALUES (%d, %d, %d, %d); |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
320 |
""" % (self.userid, id, keyword, parent)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
321 |
self.cnx.commit() |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
322 |
def remove_folders(self, id, commit = 1): |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
323 |
if id == 0: |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
324 |
raise "Can't erase base folder!" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
325 |
subs = self.get_subfolders(self, id) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
326 |
for sub in subs: |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
327 |
self.remove_folder(sub[0], 0) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
328 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
329 |
DELETE FROM folders |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
330 |
WHERE id = %d AND userid = %d; |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
331 |
""" % (id, self.userid)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
332 |
if commit: |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
333 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
334 |
def get_next_id(self, seq_name): |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
335 |
if seq_name == 'users': |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
336 |
userid = -1 |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
337 |
else: |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
338 |
userid = self.userid |
3 | 339 |
self.crs.execute(""" |
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
340 |
SELECT nextid FROM db_sequence |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
341 |
WHERE seq_name = '%s' |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
342 |
AND userid = %d |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
343 |
FOR UPDATE; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
344 |
""" % (seq_name,userid)) |
3 | 345 |
id = self.crs.fetchone()[0] |
346 |
self.crs.execute(""" |
|
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
347 |
UPDATE db_sequence SET nextid = %d |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
348 |
WHERE seq_name = '%s' |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
349 |
AND userid = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
350 |
""" % (id+1, seq_name, userid)) |
3 | 351 |
return id |
0 | 352 |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
353 |
def connect(username): |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
354 |
return MyDbConnexion(username) |