author | fabien@tzone.org |
Wed, 31 Dec 2008 01:40:46 -0500 | |
changeset 72 | 34fcc8b2c1f5 |
parent 70 | 1798859f7f6c |
child 75 | 4f6b7b48322f |
permissions | -rw-r--r-- |
3 | 1 |
import pgdb |
65
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
2 |
import os |
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
3 |
|
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
4 |
# BADSMELL: There must be an interface between both |
3 | 5 |
from bkmark import Bookmark |
0 | 6 |
|
12 | 7 |
def sql_quote(str): |
8 |
return pgdb._quote(str) |
|
9 |
||
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
10 |
class MyDbConnexion: |
65
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
11 |
def __init__(self, config): |
66 | 12 |
self.userid = None |
65
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
13 |
self.cnx = pgdb.connect(database = config.db_name, |
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
14 |
host = config.db_host+':%d'%config.db_port, |
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
15 |
user = config.db_user, password = config.db_passwd) |
3 | 16 |
self.crs = self.cnx.cursor(); |
65
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
17 |
def connect_user(self, name): |
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
18 |
if (self.userid == None): |
66 | 19 |
self.userid = self._get_user_id(name) |
65
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
20 |
if self.userid == None: |
66 | 21 |
self.userid = self._create_user(name) |
65
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
22 |
else: |
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
23 |
self.userid = self.userid[0] |
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
24 |
return self.userid |
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
25 |
def _get_user_id(self, name): |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
26 |
self.crs.execute(""" |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
27 |
SELECT id FROM users |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
28 |
WHERE name = %s; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
29 |
""" % (sql_quote(name),)) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
30 |
return self.crs.fetchone() |
65
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
31 |
def _create_user(self, name): |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
32 |
id = self.get_next_id('users') |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
33 |
self.crs.execute(""" |
44 | 34 |
INSERT INTO users(id, name, full_name) |
35 |
VALUES (%d, %s, %s); |
|
36 |
""" % (id, sql_quote(name), sql_quote(name))) |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
37 |
self.crs.execute(""" |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
38 |
INSERT INTO keywords(id, userid, name) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
39 |
VALUES (0, %d, '--'); |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
40 |
""" %(id,)) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
41 |
self.crs.execute(""" |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
42 |
INSERT INTO db_sequence(seq_name, userid, nextid) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
43 |
VALUES ('keywords', %d, 1); |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
44 |
""" %(id,)) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
45 |
self.crs.execute(""" |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
46 |
INSERT INTO db_sequence(seq_name, userid, nextid) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
47 |
VALUES ('bookmarks', %d, 0); |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
48 |
""" %(id,)) |
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
49 |
self.crs.execute(""" |
45
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
50 |
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
|
51 |
VALUES (0, 0, -1, %d); |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
52 |
""" %(id,)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
53 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
54 |
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
|
55 |
VALUES ('folders', %d, 1); |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
56 |
""" %(id,)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
57 |
self.crs.execute(""" |
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
58 |
INSERT INTO preferences(userid) |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
59 |
VALUES (%d); |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
60 |
""" %(id,)) |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
61 |
self.cnx.commit() |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
62 |
return id |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
63 |
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
|
64 |
self.crs.execute(""" |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
65 |
DELETE FROM users WHERE id = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
66 |
DELETE FROM bookmarks_keywords WHERE userid = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
67 |
DELETE FROM bookmarks WHERE userid = %d; |
47
2781ac85b807
[svn r1604] Implement default_view preferences, which move things around a lot.
fabien
parents:
45
diff
changeset
|
68 |
DELETE FROM preferences WHERE userid = %d; |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
69 |
DELETE FROM keywords WHERE userid = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
70 |
DELETE FROM db_sequence WHERE userid = %d; |
66 | 71 |
""" % ((userid,)*6)) |
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
72 |
self.cnx.commit() |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
73 |
def get_preferences(self): |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
74 |
self.crs.execute(""" |
44 | 75 |
SELECT p.keywords_box, |
76 |
p.keywords_sort, p.keywords_reverse, |
|
47
2781ac85b807
[svn r1604] Implement default_view preferences, which move things around a lot.
fabien
parents:
45
diff
changeset
|
77 |
u.full_name, p.default_view |
44 | 78 |
FROM preferences p, users u |
79 |
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
|
80 |
""" % (self.userid,)) |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
81 |
res = self.crs.fetchone() |
57 | 82 |
rev_kw = 0 |
83 |
if (res[2]): |
|
84 |
rev_kw = 1 |
|
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
85 |
return { |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
86 |
'keywords_box' : res[0], |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
87 |
'keywords_sort' : res[1], |
57 | 88 |
'keywords_reverse': rev_kw, |
47
2781ac85b807
[svn r1604] Implement default_view preferences, which move things around a lot.
fabien
parents:
45
diff
changeset
|
89 |
'fullname': res[3], |
2781ac85b807
[svn r1604] Implement default_view preferences, which move things around a lot.
fabien
parents:
45
diff
changeset
|
90 |
'default_view': res[4] |
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
91 |
} |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
92 |
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
|
93 |
if prefs['keywords_reverse']: |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
94 |
rev = 'TRUE' |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
95 |
else: |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
96 |
rev = 'FALSE' |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
97 |
self.crs.execute(""" |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
98 |
UPDATE preferences |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
99 |
SET keywords_box = %d, |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
100 |
keywords_sort = %s, |
47
2781ac85b807
[svn r1604] Implement default_view preferences, which move things around a lot.
fabien
parents:
45
diff
changeset
|
101 |
keywords_reverse = %s, |
2781ac85b807
[svn r1604] Implement default_view preferences, which move things around a lot.
fabien
parents:
45
diff
changeset
|
102 |
default_view = %d |
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
103 |
WHERE userid = %d; |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
104 |
""" % (prefs['keywords_box'], |
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
105 |
sql_quote(prefs['keywords_sort']), |
47
2781ac85b807
[svn r1604] Implement default_view preferences, which move things around a lot.
fabien
parents:
45
diff
changeset
|
106 |
rev, prefs['default_view'], self.userid)) |
44 | 107 |
self.crs.execute(""" |
108 |
UPDATE users |
|
109 |
SET full_name = %s |
|
110 |
WHERE id = %d; |
|
111 |
""" % (sql_quote(prefs["fullname"]), |
|
112 |
self.userid)) |
|
38
c30e2402deca
[svn r1582] Add some user preferences support (kw sorting and kw select box size).
fabien
parents:
33
diff
changeset
|
113 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
114 |
def add_bookmark(self, bk): |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
115 |
id = self.get_next_id('bookmarks') |
3 | 116 |
self.crs.execute(""" |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
117 |
INSERT INTO bookmarks(id, userid, url, name, ldesc, added) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
118 |
VALUES (%d, %d, %s, %s, %s, %s); |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
119 |
INSERT INTO bookmarks_keywords(bookmark, keyword, userid) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
120 |
VALUES (%d, 0, %d); |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
121 |
""" % (id, self.userid, sql_quote(bk.url), |
12 | 122 |
sql_quote(bk.name), sql_quote(bk.desc), |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
123 |
sql_quote(bk.added), |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
124 |
id, self.userid)) |
3 | 125 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
126 |
return id |
3 | 127 |
def get_bookmarks(self, ids): |
128 |
qry = """ |
|
129 |
SELECT id, url, name, ldesc, added |
|
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
130 |
FROM bookmarks |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
131 |
WHERE userid = %d AND (id = %d |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
132 |
""" % (self.userid, ids.pop(),) |
3 | 133 |
for id in ids: |
134 |
qry = qry + " OR id = %d" % (id,) |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
135 |
qry = qry + ");" |
3 | 136 |
self.crs.execute(qry) |
137 |
bks = [] |
|
138 |
list = self.crs.fetchall() |
|
139 |
for res in list: |
|
140 |
bk = Bookmark() |
|
141 |
bk.id = res[0] |
|
142 |
bk.url = res[1] |
|
143 |
bk.name = res[2] |
|
144 |
bk.desc = res[3] |
|
145 |
bk.added = res[4] |
|
146 |
bks.append(bk) |
|
147 |
return bks |
|
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
148 |
def update_bookmark(self, bk): |
3 | 149 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
150 |
UPDATE bookmarks |
12 | 151 |
SET url = %s, name = %s, |
152 |
ldesc = %s, added = %s |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
153 |
WHERE userid = %d AND id = %d; |
15 | 154 |
""" % (sql_quote(bk.url), sql_quote(bk.name), |
12 | 155 |
sql_quote(bk.desc), |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
156 |
sql_quote(bk.added), self.userid, bk.id)) |
3 | 157 |
self.cnx.commit() |
158 |
def update_keywords(self, id, keywords): |
|
159 |
self.crs.execute(""" |
|
160 |
DELETE FROM bookmarks_keywords |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
161 |
WHERE userid = %d AND bookmark = %d AND |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
162 |
keyword <> 0;""" % (self.userid, id)) |
3 | 163 |
for kw in keywords: |
164 |
if kw == 0: continue |
|
165 |
self.crs.execute(""" |
|
166 |
INSERT INTO |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
167 |
bookmarks_keywords(bookmark, keyword, userid) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
168 |
VALUES (%d, %d, %d);""" % (id, kw, self.userid)) |
3 | 169 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
170 |
def remove_bookmark(self, id): |
3 | 171 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
172 |
DELETE FROM bookmarks_keywords |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
173 |
WHERE userid = %d AND bookmark = %d; |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
174 |
DELETE FROM bookmarks |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
175 |
WHERE userid = %d AND id = %d; |
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
176 |
""" % (self.userid, id, self.userid, id)) |
3 | 177 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
178 |
def add_keyword(self, name): |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
179 |
id = self.get_next_id('keywords') |
3 | 180 |
self.crs.execute(""" |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
181 |
INSERT INTO keywords(id, userid, name) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
182 |
VALUES (%d, %d, %s); |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
183 |
""" % (id, self.userid, sql_quote(name))) |
3 | 184 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
185 |
return id |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
186 |
def get_keyword(self, id): |
3 | 187 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
188 |
SELECT name FROM keywords |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
189 |
WHERE userid = %d AND id = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
190 |
""" % (self.userid, id)) |
3 | 191 |
return self.crs.fetchone()[0] |
33 | 192 |
def get_keywords(self, bk_ids): |
193 |
if len(bk_ids) == 0: |
|
194 |
return [] |
|
195 |
qry = """ |
|
196 |
SELECT DISTINCT k.id, k.name |
|
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
197 |
FROM keywords k, bookmarks_keywords bk |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
198 |
WHERE bk.userid = %d |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
199 |
AND k.userid = %d |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
200 |
AND k.id = bk.keyword |
33 | 201 |
AND ( |
202 |
""" % (self.userid, self.userid) |
|
203 |
for id in bk_ids: |
|
41 | 204 |
qry += "bk.bookmark = %d OR " % (id,) |
33 | 205 |
qry = qry[:-3] + ") ORDER BY k.id;" |
206 |
self.crs.execute(qry) |
|
3 | 207 |
return self.crs.fetchall() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
208 |
def update_keyword(self, id, name): |
3 | 209 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
210 |
UPDATE keywords |
12 | 211 |
SET name = %s |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
212 |
WHERE userid = %d AND id = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
213 |
""" % (sql_quote(name), self.userid, id)) |
3 | 214 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
215 |
def remove_keyword(self, id): |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
216 |
if id == 0: |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
217 |
raise "Can't remove default keyword!" |
3 | 218 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
219 |
DELETE FROM bookmarks_keywords |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
220 |
WHERE keyword = %d AND userid = %d; |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
221 |
DELETE FROM keywords |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
222 |
WHERE id = %d AND userid = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
223 |
""" % (id, self.userid, id, self.userid)) |
3 | 224 |
self.cnx.commit() |
50 | 225 |
def add_keywords(self, add_id, into_id): |
226 |
self.crs.execute(""" |
|
227 |
INSERT INTO bookmarks_keywords (userid, |
|
228 |
bookmark, keyword) |
|
53 | 229 |
SELECT %d, bookmark, %d |
230 |
FROM bookmarks_keywords |
|
50 | 231 |
WHERE keyword = %d |
232 |
AND userid = %d |
|
233 |
AND bookmark NOT IN |
|
234 |
(SELECT bookmark FROM bookmarks_keywords |
|
235 |
WHERE userid = %d AND keyword = %d ) |
|
236 |
; |
|
237 |
""" % (self.userid, into_id, add_id, self.userid, |
|
238 |
self.userid, into_id)) |
|
239 |
self.cnx.commit() |
|
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
240 |
def merge_keywords(self, merge_id, into_id): |
3 | 241 |
self.crs.execute(""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
242 |
UPDATE bookmarks_keywords |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
243 |
SET keyword = %d |
15 | 244 |
WHERE keyword = %d |
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
245 |
AND userid = %d |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
246 |
AND bookmark NOT IN |
15 | 247 |
(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
|
248 |
WHERE userid = %d AND keyword = %d ) |
15 | 249 |
; |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
250 |
""" % (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
|
251 |
self.userid, into_id)) |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
252 |
self.remove_keyword(merge_id) |
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
253 |
def get_all_keywords(self): |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
254 |
"""Return a list of doublets [id, keyword, count].""" |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
255 |
self.crs.execute("""SELECT k.id, k.name |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
256 |
FROM keywords k |
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
257 |
WHERE k.userid = %d |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
258 |
ORDER BY k.id;""" % (self.userid,)) |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
259 |
res = self.crs.fetchall() |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
260 |
return res |
41 | 261 |
def get_keywords_count(self, bks = []): |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
262 |
"""Return a list of doublets [id, count]. |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
263 |
Does with a count of zero are ignored.""" |
41 | 264 |
qry = """SELECT bk.keyword, COUNT(bk.keyword) |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
265 |
FROM bookmarks_keywords bk |
41 | 266 |
WHERE bk.userid = %d""" % (self.userid,) |
267 |
if len(bks) > 0: |
|
268 |
qry += " AND ( bk.bookmark = %d" % bks[0] |
|
269 |
for bk in bks[1:]: |
|
270 |
qry += " OR bk.bookmark = %d" % bk |
|
271 |
qry += " )" |
|
272 |
qry += " GROUP BY bk.keyword ORDER BY bk.keyword;" |
|
273 |
self.crs.execute(qry) |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
274 |
res = self.crs.fetchall() |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
275 |
if not res: |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
276 |
res = [[0,0]] |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
277 |
return res |
70 | 278 |
def map_keywords(self, kws): |
279 |
"""Return a dictionnary of keywords and their ids.""" |
|
280 |
qry = """SELECT k.id, k.name |
|
281 |
FROM keywords k |
|
282 |
WHERE k.userid = %d """ % self.userid |
|
283 |
qry += " AND ( k.name = %s " % sql_quote(kws[0]) |
|
284 |
for kw in kws[1:]: |
|
285 |
qry += " OR k.name = %s " % sql_quote(kw) |
|
286 |
qry += ");" |
|
287 |
self.crs.execute(qry) |
|
288 |
res = dict((kw, -1) for kw in kws) |
|
289 |
for id, name in self.crs.fetchall(): |
|
290 |
res[name] = id |
|
291 |
return res |
|
292 |
||
53 | 293 |
def _bookmarks_selection(self, has_kw = [0], except_kw = []): |
3 | 294 |
""" |
53 | 295 |
Return a bookmarks selection query used in at least two function. |
3 | 296 |
""" |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
297 |
basic_qry = """ |
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
298 |
SELECT bk.bookmark FROM bookmarks_keywords bk |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
299 |
WHERE bk.keyword = %d |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
300 |
AND bk.userid = %d |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
301 |
""" |
3 | 302 |
|
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
303 |
qry = basic_qry % (has_kw[0], self.userid) |
3 | 304 |
for kw in has_kw[1:]: |
53 | 305 |
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
|
306 |
for kw in except_kw: |
53 | 307 |
qry += ("EXCEPT " + basic_qry % (kw, self.userid)) |
308 |
return qry |
|
309 |
def select_bookmarks(self, has_kw = [0], except_kw = []): |
|
310 |
""" |
|
311 |
Return a list of id bookmarks who has /has_kw/ set but not /except_kw/. |
|
312 |
""" |
|
313 |
qry = self._bookmarks_selection(has_kw, except_kw) + ';' |
|
3 | 314 |
self.crs.execute(qry) |
315 |
return self.crs.fetchall() |
|
54
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
316 |
def get_bookmarks_count(self, has_kw = [0], except_kw = [], opt_kw = []): |
53 | 317 |
""" |
318 |
Return a count of bookmarks which would have been return on |
|
319 |
select_bookmarks qry. |
|
320 |
""" |
|
321 |
qry = """ |
|
54
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
322 |
SELECT keyword, COUNT(keyword) |
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
323 |
FROM bookmarks_keywords |
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
324 |
WHERE userid = %d |
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
325 |
""" % self.userid |
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
326 |
if len(opt_kw) > 0: |
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
327 |
qry += "AND ( " |
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
328 |
qry += " OR ".join(map(lambda e: "keyword = %d" % e, opt_kw)) |
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
329 |
qry += ") " |
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
330 |
qry += "AND bookmark IN (" + self._bookmarks_selection(has_kw, except_kw) + ") " |
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
331 |
qry += "GROUP BY keyword ORDER BY keyword;" |
53 | 332 |
self.crs.execute(qry) |
54
f74bad856bce
[svn r1611] Optimization of db.get_bookmarks_count which was call too often.
fabien
parents:
53
diff
changeset
|
333 |
return self.crs.fetchall() |
70 | 334 |
# Folders related functionnality |
45
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
335 |
def get_folder_keyword(self, id): |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
336 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
337 |
SELECT k.id, k.name |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
338 |
FROM keywords k, folders f |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
339 |
WHERE |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
340 |
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
|
341 |
AND k.userid = f.userid |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
342 |
AND k.id = f.keyword; |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
343 |
""" %(self.userid, id)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
344 |
return self.crs.fetchone() |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
345 |
def get_subfolders(self, id): |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
346 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
347 |
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
|
348 |
FROM folders f, keywords k |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
349 |
WHERE f.userid = %d |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
350 |
AND f.parent = %d |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
351 |
AND k.userid = f.userid |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
352 |
AND k.id = f.keyword |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
353 |
ORDER BY k.name; |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
354 |
""" %(self.userid, id)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
355 |
res = self.crs.fetchall() |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
356 |
return map(lambda e: { |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
357 |
'id' : e[0], |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
358 |
'name' : e[2], |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
359 |
'keyword' : e[1] }, |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
360 |
res) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
361 |
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
|
362 |
"""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
|
363 |
if id < 0: |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
364 |
return [] |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
365 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
366 |
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
|
367 |
FROM folders f, keywords k |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
368 |
WHERE |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
369 |
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
|
370 |
AND k.userid = f.userid |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
371 |
AND k.id = f.keyword; |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
372 |
""" %(id, self.userid)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
373 |
cur = self.crs.fetchone() |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
374 |
res = [{ 'id': cur[0], |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
375 |
'name' : cur[2], |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
376 |
'keyword': cur[1] }] |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
377 |
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
|
378 |
def add_folder(self, keyword, parent): |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
379 |
id = self.get_next_id('folders') |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
380 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
381 |
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
|
382 |
VALUES (%d, %d, %d, %d); |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
383 |
""" % (self.userid, id, keyword, parent)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
384 |
self.cnx.commit() |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
385 |
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
|
386 |
if id == 0: |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
387 |
raise "Can't erase base folder!" |
47
2781ac85b807
[svn r1604] Implement default_view preferences, which move things around a lot.
fabien
parents:
45
diff
changeset
|
388 |
subs = self.get_subfolders(id) |
45
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
389 |
for sub in subs: |
52 | 390 |
self.remove_folders(sub['id'], 0) |
45
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
391 |
self.crs.execute(""" |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
392 |
DELETE FROM folders |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
393 |
WHERE id = %d AND userid = %d; |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
394 |
""" % (id, self.userid)) |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
395 |
if commit: |
c81d480c3224
[svn r1601] Add first try to get a folder's like view.
fabien
parents:
44
diff
changeset
|
396 |
self.cnx.commit() |
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
397 |
def get_next_id(self, seq_name): |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
398 |
if seq_name == 'users': |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
399 |
userid = -1 |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
400 |
else: |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
401 |
userid = self.userid |
3 | 402 |
self.crs.execute(""" |
23
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
403 |
SELECT nextid FROM db_sequence |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
404 |
WHERE seq_name = '%s' |
69c1f93892dd
[svn r1557] Correct some errors for multi-user support.
fabien
parents:
21
diff
changeset
|
405 |
AND userid = %d |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
406 |
FOR UPDATE; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
407 |
""" % (seq_name,userid)) |
3 | 408 |
id = self.crs.fetchone()[0] |
409 |
self.crs.execute(""" |
|
2
4cb6d9f3d3eb
[svn r1529] Mise � jour des fonctions d'acc�s � la DB.
fabien
parents:
0
diff
changeset
|
410 |
UPDATE db_sequence SET nextid = %d |
21
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
411 |
WHERE seq_name = '%s' |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
412 |
AND userid = %d; |
345ee7421989
[svn r1555] Add multiuser support and more templating.
fabien
parents:
15
diff
changeset
|
413 |
""" % (id+1, seq_name, userid)) |
3 | 414 |
return id |
0 | 415 |
|
65
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
416 |
def connect(config, username): |
b975a3d7606a
Partial submission, to include tests.
Fabien Ninoles <fabien@tzone.org>
parents:
57
diff
changeset
|
417 |
db = MyDbConnexion(config) |
66 | 418 |
userid = db.connect_user(username) |
419 |
if userid == None: |
|
420 |
raise "Can't connect user!" |
|
421 |
return db |