Mercurial > p > roundup > code
annotate roundup/backends/back_metakit.py @ 1496:e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Thu, 06 Mar 2003 07:33:29 +0000 |
| parents | b3f2484babce |
| children | 5c58ccad41ee |
| rev | line source |
|---|---|
|
1392
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1 ''' |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
2 Metakit backend for Roundup, originally by Gordon McMillan. |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
3 |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
4 Notes by Richard: |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
5 |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
6 This backend has some behaviour specific to metakit: |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
7 |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
8 - there's no concept of an explicit "unset" in metakit, so all types |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
9 have some "unset" value: |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
10 |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
11 ========= ===== ==================================================== |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
12 Type Value Action when fetching from mk |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
13 ========= ===== ==================================================== |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
14 Strings '' convert to None |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
15 Date 0 (seconds since 1970-01-01.00:00:00) convert to None |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
16 Interval '' convert to None |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
17 Number 0 ambiguious :( - do nothing |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
18 Boolean 0 ambiguious :( - do nothing |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
19 Link '' convert to None |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
20 Multilink [] actually, mk can handle this one ;) |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
21 Passowrd '' convert to None |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
22 ========= ===== ==================================================== |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
23 |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
24 The get/set routines handle these values accordingly by converting |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
25 to/from None where they can. The Number/Boolean types are not able |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
26 to handle an "unset" at all, so they default the "unset" to 0. |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
27 |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
28 - probably a bunch of stuff that I'm not aware of yet because I haven't |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
29 fully read through the source. One of these days.... |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
30 ''' |
|
916
76b783c69976
Session storage in the hyperdb was horribly, horribly inefficient.
Richard Jones <richard@users.sourceforge.net>
parents:
892
diff
changeset
|
31 from roundup import hyperdb, date, password, roundupdb, security |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
32 import metakit |
|
1467
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1442
diff
changeset
|
33 from sessions import Sessions, OneTimeKeys |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
34 import re, marshal, os, sys, weakref, time, calendar |
|
918
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
35 from roundup import indexer |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
36 import locking |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
37 |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
38 _dbs = {} |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
39 |
|
918
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
40 def Database(config, journaltag=None): |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
41 ''' Only have a single instance of the Database class for each instance |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
42 ''' |
|
918
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
43 db = _dbs.get(config.DATABASE, None) |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
44 if db is None or db._db is None: |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
45 db = _Database(config, journaltag) |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
46 _dbs[config.DATABASE] = db |
|
930
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
47 else: |
|
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
48 db.journaltag = journaltag |
|
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
49 try: |
|
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
50 delattr(db, 'curuserid') |
|
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
51 except AttributeError: |
|
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
52 pass |
|
918
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
53 return db |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
54 |
|
1417
472c21af7f69
fixed error in indexargs_url (thanks Patrick Ohly)
Richard Jones <richard@users.sourceforge.net>
parents:
1392
diff
changeset
|
55 class _Database(hyperdb.Database, roundupdb.Database): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
56 def __init__(self, config, journaltag=None): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
57 self.config = config |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
58 self.journaltag = journaltag |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
59 self.classes = {} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
60 self.dirty = 0 |
|
918
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
61 self.lockfile = None |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
62 self._db = self.__open() |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
63 self.indexer = Indexer(self.config.DATABASE, self._db) |
|
916
76b783c69976
Session storage in the hyperdb was horribly, horribly inefficient.
Richard Jones <richard@users.sourceforge.net>
parents:
892
diff
changeset
|
64 self.sessions = Sessions(self.config) |
|
1467
378081f066cc
registration is now a two-step process with confirmation from the
Richard Jones <richard@users.sourceforge.net>
parents:
1442
diff
changeset
|
65 self.otks = OneTimeKeys(self.config) |
|
916
76b783c69976
Session storage in the hyperdb was horribly, horribly inefficient.
Richard Jones <richard@users.sourceforge.net>
parents:
892
diff
changeset
|
66 self.security = security.Security(self) |
|
76b783c69976
Session storage in the hyperdb was horribly, horribly inefficient.
Richard Jones <richard@users.sourceforge.net>
parents:
892
diff
changeset
|
67 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
68 os.umask(0002) |
|
1131
92e92ae58494
add close() methods where they are missing!
Richard Jones <richard@users.sourceforge.net>
parents:
1002
diff
changeset
|
69 |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
70 def post_init(self): |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
71 if self.indexer.should_reindex(): |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
72 self.reindex() |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
73 |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
74 def reindex(self): |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
75 for klass in self.classes.values(): |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
76 for nodeid in klass.list(): |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
77 klass.index(nodeid) |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
78 self.indexer.save_index() |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
79 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
80 # --- defined in ping's spec |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
81 def __getattr__(self, classname): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
82 if classname == 'curuserid': |
|
1176
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
83 if self.journaltag is None: |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
84 return None |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
85 |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
86 # try to set the curuserid from the journaltag |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
87 try: |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
88 x = int(self.classes['user'].lookup(self.journaltag)) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
89 self.curuserid = x |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
90 except KeyError: |
|
1176
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
91 if self.journaltag == 'admin': |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
92 self.curuserid = x = 1 |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
93 else: |
|
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
94 x = 0 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
95 return x |
|
926
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
96 elif classname == 'transactions': |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
97 return self.dirty |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
98 # fall back on the classes |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
99 return self.getclass(classname) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
100 def getclass(self, classname): |
|
1145
81941abedb0a
nicer error message for invalid class lookup
Richard Jones <richard@users.sourceforge.net>
parents:
1143
diff
changeset
|
101 try: |
|
81941abedb0a
nicer error message for invalid class lookup
Richard Jones <richard@users.sourceforge.net>
parents:
1143
diff
changeset
|
102 return self.classes[classname] |
|
81941abedb0a
nicer error message for invalid class lookup
Richard Jones <richard@users.sourceforge.net>
parents:
1143
diff
changeset
|
103 except KeyError: |
|
81941abedb0a
nicer error message for invalid class lookup
Richard Jones <richard@users.sourceforge.net>
parents:
1143
diff
changeset
|
104 raise KeyError, 'There is no class called "%s"'%classname |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
105 def getclasses(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
106 return self.classes.keys() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
107 # --- end of ping's spec |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
108 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
109 # --- exposed methods |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
110 def commit(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
111 if self.dirty: |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
112 self._db.commit() |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
113 for cl in self.classes.values(): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
114 cl._commit() |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
115 self.indexer.save_index() |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
116 self.dirty = 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
117 def rollback(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
118 if self.dirty: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
119 for cl in self.classes.values(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
120 cl._rollback() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
121 self._db.rollback() |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
122 self._db = None |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
123 self._db = metakit.storage(self.dbnm, 1) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
124 self.hist = self._db.view('history') |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
125 self.tables = self._db.view('tables') |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
126 self.indexer.rollback() |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
127 self.indexer.datadb = self._db |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
128 self.dirty = 0 |
|
1232
c6a844d48176
Add clearCache method to DB.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1179
diff
changeset
|
129 def clearCache(self): |
|
c6a844d48176
Add clearCache method to DB.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1179
diff
changeset
|
130 for cl in self.classes.values(): |
|
c6a844d48176
Add clearCache method to DB.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1179
diff
changeset
|
131 cl._commit() |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
132 def clear(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
133 for cl in self.classes.values(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
134 cl._clear() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
135 def hasnode(self, classname, nodeid): |
|
918
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
136 return self.getclass(classname).hasnode(nodeid) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
137 def pack(self, pack_before): |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
138 mindate = int(calendar.timegm(pack_before.get_tuple())) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
139 i = 0 |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
140 while i < len(self.hist): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
141 if self.hist[i].date < mindate and self.hist[i].action != _CREATE: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
142 self.hist.delete(i) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
143 else: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
144 i = i + 1 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
145 def addclass(self, cl): |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
146 self.classes[cl.classname] = cl |
|
918
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
147 if self.tables.find(name=cl.classname) < 0: |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
148 self.tables.append(name=cl.classname) |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
149 def addjournal(self, tablenm, nodeid, action, params, creator=None, |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
150 creation=None): |
|
1179
9b013302c582
Remove some nasty debugging code.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1177
diff
changeset
|
151 tblid = self.tables.find(name=tablenm) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
152 if tblid == -1: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
153 tblid = self.tables.append(name=tablenm) |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
154 if creator is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
155 creator = self.curuserid |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
156 else: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
157 try: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
158 creator = int(creator) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
159 except TypeError: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
160 creator = int(self.getclass('user').lookup(creator)) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
161 if creation is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
162 creation = int(time.time()) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
163 elif isinstance(creation, date.Date): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
164 creation = int(calendar.timegm(creation.get_tuple())) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
165 # tableid:I,nodeid:I,date:I,user:I,action:I,params:B |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
166 self.hist.append(tableid=tblid, |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
167 nodeid=int(nodeid), |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
168 date=creation, |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
169 action=action, |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
170 user = creator, |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
171 params = marshal.dumps(params)) |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
172 def getjournal(self, tablenm, nodeid): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
173 rslt = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
174 tblid = self.tables.find(name=tablenm) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
175 if tblid == -1: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
176 return rslt |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
177 q = self.hist.select(tableid=tblid, nodeid=int(nodeid)) |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
178 if len(q) == 0: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
179 raise IndexError, "no history for id %s in %s" % (nodeid, tablenm) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
180 i = 0 |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
181 #userclass = self.getclass('user') |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
182 for row in q: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
183 try: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
184 params = marshal.loads(row.params) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
185 except ValueError: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
186 print "history couldn't unmarshal %r" % row.params |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
187 params = {} |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
188 #usernm = userclass.get(str(row.user), 'username') |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
189 dt = date.Date(time.gmtime(row.date)) |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
190 #rslt.append((nodeid, dt, usernm, _actionnames[row.action], params)) |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
191 rslt.append((nodeid, dt, str(row.user), _actionnames[row.action], |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
192 params)) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
193 return rslt |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
194 |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
195 def destroyjournal(self, tablenm, nodeid): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
196 nodeid = int(nodeid) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
197 tblid = self.tables.find(name=tablenm) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
198 if tblid == -1: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
199 return |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
200 i = 0 |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
201 hist = self.hist |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
202 while i < len(hist): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
203 if hist[i].tableid == tblid and hist[i].nodeid == nodeid: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
204 hist.delete(i) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
205 else: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
206 i = i + 1 |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
207 self.dirty = 1 |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
208 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
209 def close(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
210 for cl in self.classes.values(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
211 cl.db = None |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
212 self._db = None |
| 1143 | 213 if self.lockfile is not None: |
| 214 locking.release_lock(self.lockfile) | |
| 215 if _dbs.has_key(self.config.DATABASE): | |
| 216 del _dbs[self.config.DATABASE] | |
| 217 if self.lockfile is not None: | |
| 218 self.lockfile.close() | |
| 219 self.lockfile = None | |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
220 self.classes = {} |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
221 self.indexer = None |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
222 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
223 # --- internal |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
224 def __open(self): |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
225 ''' Open the metakit database |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
226 ''' |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
227 # make the database dir if it doesn't exist |
|
1232
c6a844d48176
Add clearCache method to DB.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1179
diff
changeset
|
228 if not os.path.exists(self.config.DATABASE): |
|
c6a844d48176
Add clearCache method to DB.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1179
diff
changeset
|
229 os.makedirs(self.config.DATABASE) |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
230 |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
231 # figure the file names |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
232 self.dbnm = db = os.path.join(self.config.DATABASE, 'tracker.mk4') |
|
918
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
233 lockfilenm = db[:-3]+'lck' |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
234 |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
235 # get the database lock |
|
918
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
236 self.lockfile = locking.acquire_lock(lockfilenm) |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
237 self.lockfile.write(str(os.getpid())) |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
238 self.lockfile.flush() |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
239 |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
240 # see if the schema has changed since last db access |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
241 self.fastopen = 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
242 if os.path.exists(db): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
243 dbtm = os.path.getmtime(db) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
244 pkgnm = self.config.__name__.split('.')[0] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
245 schemamod = sys.modules.get(pkgnm+'.dbinit', None) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
246 if schemamod: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
247 if os.path.exists(schemamod.__file__): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
248 schematm = os.path.getmtime(schemamod.__file__) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
249 if schematm < dbtm: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
250 # found schema mod - it's older than the db |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
251 self.fastopen = 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
252 else: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
253 # can't find schemamod - must be frozen |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
254 self.fastopen = 1 |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
255 |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
256 # open the db |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
257 db = metakit.storage(db, 1) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
258 hist = db.view('history') |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
259 tables = db.view('tables') |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
260 if not self.fastopen: |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
261 # create the database if it's brand new |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
262 if not hist.structure(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
263 hist = db.getas('history[tableid:I,nodeid:I,date:I,user:I,action:I,params:B]') |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
264 if not tables.structure(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
265 tables = db.getas('tables[name:S]') |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
266 db.commit() |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
267 |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
268 # we now have an open, initialised database |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
269 self.tables = tables |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
270 self.hist = hist |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
271 return db |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
272 |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
273 def setid(self, classname, maxid): |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
274 ''' No-op in metakit |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
275 ''' |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
276 pass |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
277 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
278 _STRINGTYPE = type('') |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
279 _LISTTYPE = type([]) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
280 _CREATE, _SET, _RETIRE, _LINK, _UNLINK = range(5) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
281 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
282 _actionnames = { |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
283 _CREATE : 'create', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
284 _SET : 'set', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
285 _RETIRE : 'retire', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
286 _LINK : 'link', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
287 _UNLINK : 'unlink', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
288 } |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
289 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
290 _marker = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
291 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
292 _ALLOWSETTINGPRIVATEPROPS = 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
293 |
|
874
b9da8729d8ff
Fix bug in setting activity.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
872
diff
changeset
|
294 class Class: |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
295 privateprops = None |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
296 def __init__(self, db, classname, **properties): |
|
918
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
297 #self.db = weakref.proxy(db) |
|
fd95d395060f
Lock the database, which means another round of making sure there's only one.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
916
diff
changeset
|
298 self.db = db |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
299 self.classname = classname |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
300 self.keyname = None |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
301 self.ruprops = properties |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
302 self.privateprops = { 'id' : hyperdb.String(), |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
303 'activity' : hyperdb.Date(), |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
304 'creation' : hyperdb.Date(), |
|
1176
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
305 'creator' : hyperdb.Link('user') } |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
306 |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
307 # event -> list of callables |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
308 self.auditors = {'create': [], 'set': [], 'retire': []} |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
309 self.reactors = {'create': [], 'set': [], 'retire': []} |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
310 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
311 view = self.__getview() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
312 self.maxid = 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
313 if view: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
314 self.maxid = view[-1].id + 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
315 self.uncommitted = {} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
316 self.rbactions = [] |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
317 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
318 # people reach inside!! |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
319 self.properties = self.ruprops |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
320 self.db.addclass(self) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
321 self.idcache = {} |
|
860
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
322 |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
323 # default is to journal changes |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
324 self.do_journal = 1 |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
325 |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
326 def enableJournalling(self): |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
327 '''Turn journalling on for this class |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
328 ''' |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
329 self.do_journal = 1 |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
330 |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
331 def disableJournalling(self): |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
332 '''Turn journalling off for this class |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
333 ''' |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
334 self.do_journal = 0 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
335 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
336 # --- the roundup.Class methods |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
337 def audit(self, event, detector): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
338 l = self.auditors[event] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
339 if detector not in l: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
340 self.auditors[event].append(detector) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
341 def fireAuditors(self, action, nodeid, newvalues): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
342 for audit in self.auditors[action]: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
343 audit(self.db, self, nodeid, newvalues) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
344 def fireReactors(self, action, nodeid, oldvalues): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
345 for react in self.reactors[action]: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
346 react(self.db, self, nodeid, oldvalues) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
347 def react(self, event, detector): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
348 l = self.reactors[event] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
349 if detector not in l: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
350 self.reactors[event].append(detector) |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
351 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
352 # --- the hyperdb.Class methods |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
353 def create(self, **propvalues): |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
354 self.fireAuditors('create', None, propvalues) |
|
1431
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
355 newid = self.create_inner(**propvalues) |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
356 # self.set() (called in self.create_inner()) does reactors) |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
357 return newid |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
358 |
|
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
359 def create_inner(self, **propvalues): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
360 rowdict = {} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
361 rowdict['id'] = newid = self.maxid |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
362 self.maxid += 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
363 ndx = self.getview(1).append(rowdict) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
364 propvalues['#ISNEW'] = 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
365 try: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
366 self.set(str(newid), **propvalues) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
367 except Exception: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
368 self.maxid -= 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
369 raise |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
370 return str(newid) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
371 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
372 def get(self, nodeid, propname, default=_marker, cache=1): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
373 # default and cache aren't in the spec |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
374 # cache=0 means "original value" |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
375 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
376 view = self.getview() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
377 id = int(nodeid) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
378 if cache == 0: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
379 oldnode = self.uncommitted.get(id, None) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
380 if oldnode and oldnode.has_key(propname): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
381 return oldnode[propname] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
382 ndx = self.idcache.get(id, None) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
383 if ndx is None: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
384 ndx = view.find(id=id) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
385 if ndx < 0: |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
386 raise IndexError, "%s has no node %s" % (self.classname, nodeid) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
387 self.idcache[id] = ndx |
|
854
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
388 try: |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
389 raw = getattr(view[ndx], propname) |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
390 except AttributeError: |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
391 raise KeyError, propname |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
392 rutyp = self.ruprops.get(propname, None) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
393 if rutyp is None: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
394 rutyp = self.privateprops[propname] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
395 converter = _converters.get(rutyp.__class__, None) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
396 if converter: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
397 raw = converter(raw) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
398 return raw |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
399 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
400 def set(self, nodeid, **propvalues): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
401 isnew = 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
402 if propvalues.has_key('#ISNEW'): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
403 isnew = 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
404 del propvalues['#ISNEW'] |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
405 if not isnew: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
406 self.fireAuditors('set', nodeid, propvalues) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
407 if not propvalues: |
|
930
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
408 return propvalues |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
409 if propvalues.has_key('id'): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
410 raise KeyError, '"id" is reserved' |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
411 if self.db.journaltag is None: |
|
1176
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
412 raise hyperdb.DatabaseError, 'Database open read-only' |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
413 view = self.getview(1) |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
414 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
415 # node must exist & not be retired |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
416 id = int(nodeid) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
417 ndx = view.find(id=id) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
418 if ndx < 0: |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
419 raise IndexError, "%s has no node %s" % (self.classname, nodeid) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
420 row = view[ndx] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
421 if row._isdel: |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
422 raise IndexError, "%s has no node %s" % (self.classname, nodeid) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
423 oldnode = self.uncommitted.setdefault(id, {}) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
424 changes = {} |
| 1143 | 425 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
426 for key, value in propvalues.items(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
427 # this will raise the KeyError if the property isn't valid |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
428 # ... we don't use getprops() here because we only care about |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
429 # the writeable properties. |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
430 if _ALLOWSETTINGPRIVATEPROPS: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
431 prop = self.ruprops.get(key, None) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
432 if not prop: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
433 prop = self.privateprops[key] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
434 else: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
435 prop = self.ruprops[key] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
436 converter = _converters.get(prop.__class__, lambda v: v) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
437 # if the value's the same as the existing value, no sense in |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
438 # doing anything |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
439 oldvalue = converter(getattr(row, key)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
440 if value == oldvalue: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
441 del propvalues[key] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
442 continue |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
443 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
444 # check to make sure we're not duplicating an existing key |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
445 if key == self.keyname: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
446 iv = self.getindexview(1) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
447 ndx = iv.find(k=value) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
448 if ndx == -1: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
449 iv.append(k=value, i=row.id) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
450 if not isnew: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
451 ndx = iv.find(k=oldvalue) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
452 if ndx > -1: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
453 iv.delete(ndx) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
454 else: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
455 raise ValueError, 'node with key "%s" exists'%value |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
456 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
457 # do stuff based on the prop type |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
458 if isinstance(prop, hyperdb.Link): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
459 link_class = prop.classname |
|
927
51519406b73e
web forms may now unset Link values (like assignedto)
Richard Jones <richard@users.sourceforge.net>
parents:
926
diff
changeset
|
460 # must be a string or None |
|
51519406b73e
web forms may now unset Link values (like assignedto)
Richard Jones <richard@users.sourceforge.net>
parents:
926
diff
changeset
|
461 if value is not None and not isinstance(value, type('')): |
|
51519406b73e
web forms may now unset Link values (like assignedto)
Richard Jones <richard@users.sourceforge.net>
parents:
926
diff
changeset
|
462 raise ValueError, 'property "%s" link value be a string'%( |
|
1176
bd3b57859c37
On second thought, that last checkin was dumb.
Richard Jones <richard@users.sourceforge.net>
parents:
1175
diff
changeset
|
463 key) |
|
930
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
464 # Roundup sets to "unselected" by passing None |
|
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
465 if value is None: |
|
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
466 value = 0 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
467 # if it isn't a number, it's a key |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
468 try: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
469 int(value) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
470 except ValueError: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
471 try: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
472 value = self.db.getclass(link_class).lookup(value) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
473 except (TypeError, KeyError): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
474 raise IndexError, 'new property "%s": %s not a %s'%( |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
475 key, value, prop.classname) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
476 |
|
927
51519406b73e
web forms may now unset Link values (like assignedto)
Richard Jones <richard@users.sourceforge.net>
parents:
926
diff
changeset
|
477 if (value is not None and |
|
51519406b73e
web forms may now unset Link values (like assignedto)
Richard Jones <richard@users.sourceforge.net>
parents:
926
diff
changeset
|
478 not self.db.getclass(link_class).hasnode(value)): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
479 raise IndexError, '%s has no node %s'%(link_class, value) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
480 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
481 setattr(row, key, int(value)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
482 changes[key] = oldvalue |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
483 |
|
860
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
484 if self.do_journal and prop.do_journal: |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
485 # register the unlink with the old linked node |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
486 if oldvalue: |
|
1392
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
487 self.db.addjournal(link_class, oldvalue, _UNLINK, |
|
927
51519406b73e
web forms may now unset Link values (like assignedto)
Richard Jones <richard@users.sourceforge.net>
parents:
926
diff
changeset
|
488 (self.classname, str(row.id), key)) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
489 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
490 # register the link with the newly linked node |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
491 if value: |
|
927
51519406b73e
web forms may now unset Link values (like assignedto)
Richard Jones <richard@users.sourceforge.net>
parents:
926
diff
changeset
|
492 self.db.addjournal(link_class, value, _LINK, |
|
51519406b73e
web forms may now unset Link values (like assignedto)
Richard Jones <richard@users.sourceforge.net>
parents:
926
diff
changeset
|
493 (self.classname, str(row.id), key)) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
494 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
495 elif isinstance(prop, hyperdb.Multilink): |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
496 if value is not None and type(value) != _LISTTYPE: |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
497 raise TypeError, 'new property "%s" not a list of ids'%key |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
498 link_class = prop.classname |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
499 l = [] |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
500 if value is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
501 value = [] |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
502 for entry in value: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
503 if type(entry) != _STRINGTYPE: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
504 raise ValueError, 'new property "%s" link value ' \ |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
505 'must be a string'%key |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
506 # if it isn't a number, it's a key |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
507 try: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
508 int(entry) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
509 except ValueError: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
510 try: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
511 entry = self.db.getclass(link_class).lookup(entry) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
512 except (TypeError, KeyError): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
513 raise IndexError, 'new property "%s": %s not a %s'%( |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
514 key, entry, prop.classname) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
515 l.append(entry) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
516 propvalues[key] = value = l |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
517 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
518 # handle removals |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
519 rmvd = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
520 for id in oldvalue: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
521 if id not in value: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
522 rmvd.append(id) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
523 # register the unlink with the old linked node |
|
860
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
524 if self.do_journal and prop.do_journal: |
| 1143 | 525 self.db.addjournal(link_class, id, _UNLINK, |
| 526 (self.classname, str(row.id), key)) | |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
527 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
528 # handle additions |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
529 adds = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
530 for id in value: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
531 if id not in oldvalue: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
532 if not self.db.getclass(link_class).hasnode(id): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
533 raise IndexError, '%s has no node %s'%( |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
534 link_class, id) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
535 adds.append(id) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
536 # register the link with the newly linked node |
|
860
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
537 if self.do_journal and prop.do_journal: |
| 1143 | 538 self.db.addjournal(link_class, id, _LINK, |
| 539 (self.classname, str(row.id), key)) | |
|
1385
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
540 |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
541 # perform the modifications on the actual property value |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
542 sv = getattr(row, key) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
543 i = 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
544 while i < len(sv): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
545 if str(sv[i].fid) in rmvd: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
546 sv.delete(i) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
547 else: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
548 i += 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
549 for id in adds: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
550 sv.append(fid=int(id)) |
|
1385
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
551 |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
552 # figure the journal entry |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
553 l = [] |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
554 if adds: |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
555 l.append(('+', adds)) |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
556 if rmvd: |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
557 l.append(('-', rmvd)) |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
558 if l: |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
559 changes[key] = tuple(l) |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
560 #changes[key] = oldvalue |
|
2bd4822f96a6
- more fixes to CGI form handling
Richard Jones <richard@users.sourceforge.net>
parents:
1351
diff
changeset
|
561 |
|
930
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
562 if not rmvd and not adds: |
|
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
563 del propvalues[key] |
|
1389
7f9bd5b1e798
*** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
1385
diff
changeset
|
564 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
565 elif isinstance(prop, hyperdb.String): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
566 if value is not None and type(value) != _STRINGTYPE: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
567 raise TypeError, 'new property "%s" not a string'%key |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
568 if value is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
569 value = '' |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
570 setattr(row, key, value) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
571 changes[key] = oldvalue |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
572 if hasattr(prop, 'isfilename') and prop.isfilename: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
573 propvalues[key] = os.path.basename(value) |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
574 if prop.indexme: |
| 1143 | 575 self.db.indexer.add_text((self.classname, nodeid, key), |
| 576 value, 'text/plain') | |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
577 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
578 elif isinstance(prop, hyperdb.Password): |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
579 if value is not None and not isinstance(value, password.Password): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
580 raise TypeError, 'new property "%s" not a Password'% key |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
581 if value is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
582 value = '' |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
583 setattr(row, key, str(value)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
584 changes[key] = str(oldvalue) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
585 propvalues[key] = str(value) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
586 |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
587 elif isinstance(prop, hyperdb.Date): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
588 if value is not None and not isinstance(value, date.Date): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
589 raise TypeError, 'new property "%s" not a Date'% key |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
590 if value is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
591 setattr(row, key, 0) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
592 else: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
593 setattr(row, key, int(calendar.timegm(value.get_tuple()))) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
594 changes[key] = str(oldvalue) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
595 propvalues[key] = str(value) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
596 |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
597 elif isinstance(prop, hyperdb.Interval): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
598 if value is not None and not isinstance(value, date.Interval): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
599 raise TypeError, 'new property "%s" not an Interval'% key |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
600 if value is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
601 setattr(row, key, '') |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
602 else: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
603 setattr(row, key, str(value)) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
604 changes[key] = str(oldvalue) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
605 propvalues[key] = str(value) |
|
880
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
606 |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
607 elif isinstance(prop, hyperdb.Number): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
608 if value is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
609 value = 0 |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
610 try: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
611 v = int(value) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
612 except ValueError: |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
613 raise TypeError, "%s (%s) is not numeric"%(key, repr(value)) |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
614 setattr(row, key, v) |
|
880
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
615 changes[key] = oldvalue |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
616 propvalues[key] = value |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
617 |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
618 elif isinstance(prop, hyperdb.Boolean): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
619 if value is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
620 bv = 0 |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
621 elif value not in (0,1): |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
622 raise TypeError, "%s (%s) is not boolean"%(key, repr(value)) |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
623 else: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
624 bv = value |
|
880
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
625 setattr(row, key, bv) |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
626 changes[key] = oldvalue |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
627 propvalues[key] = value |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
628 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
629 oldnode[key] = oldvalue |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
630 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
631 # nothing to do? |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
632 if not propvalues: |
|
930
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
633 return propvalues |
|
874
b9da8729d8ff
Fix bug in setting activity.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
872
diff
changeset
|
634 if not propvalues.has_key('activity'): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
635 row.activity = int(time.time()) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
636 if isnew: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
637 if not row.creation: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
638 row.creation = int(time.time()) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
639 if not row.creator: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
640 row.creator = self.db.curuserid |
|
1431
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
641 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
642 self.db.dirty = 1 |
|
860
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
643 if self.do_journal: |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
644 if isnew: |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
645 self.db.addjournal(self.classname, nodeid, _CREATE, {}) |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
646 self.fireReactors('create', nodeid, None) |
|
860
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
647 else: |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
648 self.db.addjournal(self.classname, nodeid, _SET, changes) |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
649 self.fireReactors('set', nodeid, oldnode) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
650 |
|
930
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
651 return propvalues |
|
3c344e942055
Use same regex to split search terms as used to index text.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
927
diff
changeset
|
652 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
653 def retire(self, nodeid): |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
654 if self.db.journaltag is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
655 raise hyperdb.DatabaseError, 'Database open read-only' |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
656 self.fireAuditors('retire', nodeid, None) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
657 view = self.getview(1) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
658 ndx = view.find(id=int(nodeid)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
659 if ndx < 0: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
660 raise KeyError, "nodeid %s not found" % nodeid |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
661 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
662 row = view[ndx] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
663 oldvalues = self.uncommitted.setdefault(row.id, {}) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
664 oldval = oldvalues['_isdel'] = row._isdel |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
665 row._isdel = 1 |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
666 |
|
860
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
667 if self.do_journal: |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
668 self.db.addjournal(self.classname, nodeid, _RETIRE, {}) |
|
926
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
669 if self.keyname: |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
670 iv = self.getindexview(1) |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
671 ndx = iv.find(k=getattr(row, self.keyname),i=row.id) |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
672 if ndx > -1: |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
673 iv.delete(ndx) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
674 self.db.dirty = 1 |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
675 self.fireReactors('retire', nodeid, None) |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
676 |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
677 def is_retired(self, nodeid): |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
678 view = self.getview(1) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
679 # node must exist & not be retired |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
680 id = int(nodeid) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
681 ndx = view.find(id=id) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
682 if ndx < 0: |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
683 raise IndexError, "%s has no node %s" % (self.classname, nodeid) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
684 row = view[ndx] |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
685 return row._isdel |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
686 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
687 def history(self, nodeid): |
|
860
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
688 if not self.do_journal: |
|
2df32a73eb45
Implemented a switch to disable journalling for a Class.
Richard Jones <richard@users.sourceforge.net>
parents:
859
diff
changeset
|
689 raise ValueError, 'Journalling is disabled for this class' |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
690 return self.db.getjournal(self.classname, nodeid) |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
691 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
692 def setkey(self, propname): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
693 if self.keyname: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
694 if propname == self.keyname: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
695 return |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
696 raise ValueError, "%s already indexed on %s"%(self.classname, |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
697 self.keyname) |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
698 prop = self.properties.get(propname, None) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
699 if prop is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
700 prop = self.privateprops.get(propname, None) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
701 if prop is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
702 raise KeyError, "no property %s" % propname |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
703 if not isinstance(prop, hyperdb.String): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
704 raise TypeError, "%s is not a String" % propname |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
705 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
706 # first setkey for this run |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
707 self.keyname = propname |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
708 iv = self.db._db.view('_%s' % self.classname) |
|
872
bd6211d39328
Saving, running & editing queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
860
diff
changeset
|
709 if self.db.fastopen and iv.structure(): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
710 return |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
711 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
712 # very first setkey ever |
|
872
bd6211d39328
Saving, running & editing queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
860
diff
changeset
|
713 self.db.dirty = 1 |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
714 iv = self.db._db.getas('_%s[k:S,i:I]' % self.classname) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
715 iv = iv.ordered(1) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
716 for row in self.getview(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
717 iv.append(k=getattr(row, propname), i=row.id) |
|
872
bd6211d39328
Saving, running & editing queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
860
diff
changeset
|
718 self.db.commit() |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
719 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
720 def getkey(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
721 return self.keyname |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
722 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
723 def lookup(self, keyvalue): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
724 if type(keyvalue) is not _STRINGTYPE: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
725 raise TypeError, "%r is not a string" % keyvalue |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
726 iv = self.getindexview() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
727 if iv: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
728 ndx = iv.find(k=keyvalue) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
729 if ndx > -1: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
730 return str(iv[ndx].i) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
731 else: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
732 view = self.getview() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
733 ndx = view.find({self.keyname:keyvalue, '_isdel':0}) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
734 if ndx > -1: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
735 return str(view[ndx].id) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
736 raise KeyError, keyvalue |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
737 |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
738 def destroy(self, id): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
739 view = self.getview(1) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
740 ndx = view.find(id=int(id)) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
741 if ndx > -1: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
742 if self.keyname: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
743 keyvalue = getattr(view[ndx], self.keyname) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
744 iv = self.getindexview(1) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
745 if iv: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
746 ivndx = iv.find(k=keyvalue) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
747 if ivndx > -1: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
748 iv.delete(ivndx) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
749 view.delete(ndx) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
750 self.db.destroyjournal(self.classname, id) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
751 self.db.dirty = 1 |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
752 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
753 def find(self, **propspec): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
754 """Get the ids of nodes in this class which link to the given nodes. |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
755 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
756 'propspec' consists of keyword args propname={nodeid:1,} |
|
854
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
757 'propname' must be the name of a property in this class, or a |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
758 KeyError is raised. That property must be a Link or |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
759 Multilink property, or a TypeError is raised. |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
760 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
761 Any node in this class whose propname property links to any of the |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
762 nodeids will be returned. Used by the full text indexing, which knows |
|
854
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
763 that "foo" occurs in msg1, msg3 and file7; so we have hits on these |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
764 issues: |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
765 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
766 db.issue.find(messages={'1':1,'3':1}, files={'7':1}) |
|
854
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
767 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
768 """ |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
769 propspec = propspec.items() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
770 for propname, nodeid in propspec: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
771 # check the prop is OK |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
772 prop = self.ruprops[propname] |
|
854
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
773 if (not isinstance(prop, hyperdb.Link) and |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
774 not isinstance(prop, hyperdb.Multilink)): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
775 raise TypeError, "'%s' not a Link/Multilink property"%propname |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
776 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
777 vws = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
778 for propname, ids in propspec: |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
779 if type(ids) is _STRINGTYPE: |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
780 ids = {int(ids):1} |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
781 else: |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
782 d = {} |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
783 for id in ids.keys(): |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
784 d[int(id)] = 1 |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
785 ids = d |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
786 prop = self.ruprops[propname] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
787 view = self.getview() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
788 if isinstance(prop, hyperdb.Multilink): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
789 def ff(row, nm=propname, ids=ids): |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
790 sv = getattr(row, nm) |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
791 for sr in sv: |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
792 if ids.has_key(sr.fid): |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
793 return 1 |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
794 return 0 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
795 else: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
796 def ff(row, nm=propname, ids=ids): |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
797 return ids.has_key(getattr(row, nm)) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
798 ndxview = view.filter(ff) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
799 vws.append(ndxview.unique()) |
|
854
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
800 |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
801 # handle the empty match case |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
802 if not vws: |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
803 return [] |
|
3cdfa5d86cec
Added metakit backend to the db tests...
Richard Jones <richard@users.sourceforge.net>
parents:
832
diff
changeset
|
804 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
805 ndxview = vws[0] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
806 for v in vws[1:]: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
807 ndxview = ndxview.union(v) |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
808 view = self.getview().remapwith(ndxview) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
809 rslt = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
810 for row in view: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
811 rslt.append(str(row.id)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
812 return rslt |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
813 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
814 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
815 def list(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
816 l = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
817 for row in self.getview().select(_isdel=0): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
818 l.append(str(row.id)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
819 return l |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
820 |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
821 def getnodeids(self): |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
822 l = [] |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
823 for row in self.getview(): |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
824 l.append(str(row.id)) |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
825 return l |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
826 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
827 def count(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
828 return len(self.getview()) |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
829 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
830 def getprops(self, protected=1): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
831 # protected is not in ping's spec |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
832 allprops = self.ruprops.copy() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
833 if protected and self.privateprops is not None: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
834 allprops.update(self.privateprops) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
835 return allprops |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
836 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
837 def addprop(self, **properties): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
838 for key in properties.keys(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
839 if self.ruprops.has_key(key): |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
840 raise ValueError, "%s is already a property of %s"%(key, |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
841 self.classname) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
842 self.ruprops.update(properties) |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
843 # Class structure has changed |
|
872
bd6211d39328
Saving, running & editing queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
860
diff
changeset
|
844 self.db.fastopen = 0 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
845 view = self.__getview() |
|
872
bd6211d39328
Saving, running & editing queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
860
diff
changeset
|
846 self.db.commit() |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
847 # ---- end of ping's spec |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
848 |
|
1249
6c24a86a12ae
Fixes for SourceForge tracker bugs.
Richard Jones <richard@users.sourceforge.net>
parents:
1243
diff
changeset
|
849 def filter(self, search_matches, filterspec, sort=(None,None), |
|
6c24a86a12ae
Fixes for SourceForge tracker bugs.
Richard Jones <richard@users.sourceforge.net>
parents:
1243
diff
changeset
|
850 group=(None,None)): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
851 # search_matches is None or a set (dict of {nodeid: {propname:[nodeid,...]}}) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
852 # filterspec is a dict {propname:value} |
| 1002 | 853 # sort and group are (dir, prop) where dir is '+', '-' or None |
| 854 # and prop is a prop name or None | |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
855 where = {'_isdel':0} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
856 mlcriteria = {} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
857 regexes = {} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
858 orcriteria = {} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
859 for propname, value in filterspec.items(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
860 prop = self.ruprops.get(propname, None) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
861 if prop is None: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
862 prop = self.privateprops[propname] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
863 if isinstance(prop, hyperdb.Multilink): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
864 if type(value) is not _LISTTYPE: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
865 value = [value] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
866 # transform keys to ids |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
867 u = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
868 for item in value: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
869 try: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
870 item = int(item) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
871 except (TypeError, ValueError): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
872 item = int(self.db.getclass(prop.classname).lookup(item)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
873 if item == -1: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
874 item = 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
875 u.append(item) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
876 mlcriteria[propname] = u |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
877 elif isinstance(prop, hyperdb.Link): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
878 if type(value) is not _LISTTYPE: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
879 value = [value] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
880 # transform keys to ids |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
881 u = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
882 for item in value: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
883 try: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
884 item = int(item) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
885 except (TypeError, ValueError): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
886 item = int(self.db.getclass(prop.classname).lookup(item)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
887 if item == -1: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
888 item = 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
889 u.append(item) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
890 if len(u) == 1: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
891 where[propname] = u[0] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
892 else: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
893 orcriteria[propname] = u |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
894 elif isinstance(prop, hyperdb.String): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
895 # simple glob searching |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
896 v = re.sub(r'([\|\{\}\\\.\+\[\]\(\)])', r'\\\1', value) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
897 v = v.replace('?', '.') |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
898 v = v.replace('*', '.*?') |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
899 regexes[propname] = re.compile(v, re.I) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
900 elif propname == 'id': |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
901 where[propname] = int(value) |
|
880
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
902 elif isinstance(prop, hyperdb.Boolean): |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
903 if type(value) is _STRINGTYPE: |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
904 bv = value.lower() in ('yes', 'true', 'on', '1') |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
905 else: |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
906 bv = value |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
907 where[propname] = bv |
|
1351
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1333
diff
changeset
|
908 elif isinstance(prop, hyperdb.Date): |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1333
diff
changeset
|
909 t = date.Date(value).get_tuple() |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1333
diff
changeset
|
910 where[propname] = int(calendar.timegm(t)) |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1333
diff
changeset
|
911 elif isinstance(prop, hyperdb.Interval): |
|
d1bfb479e527
fixed searching on date / interval fields [SF#658157]
Richard Jones <richard@users.sourceforge.net>
parents:
1333
diff
changeset
|
912 where[propname] = str(date.Interval(value)) |
|
880
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
913 elif isinstance(prop, hyperdb.Number): |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
914 where[propname] = int(value) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
915 else: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
916 where[propname] = str(value) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
917 v = self.getview() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
918 #print "filter start at %s" % time.time() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
919 if where: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
920 v = v.select(where) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
921 #print "filter where at %s" % time.time() |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
922 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
923 if mlcriteria: |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
924 # multilink - if any of the nodeids required by the |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
925 # filterspec aren't in this node's property, then skip it |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
926 def ff(row, ml=mlcriteria): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
927 for propname, values in ml.items(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
928 sv = getattr(row, propname) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
929 for id in values: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
930 if sv.find(fid=id) == -1: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
931 return 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
932 return 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
933 iv = v.filter(ff) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
934 v = v.remapwith(iv) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
935 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
936 #print "filter mlcrit at %s" % time.time() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
937 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
938 if orcriteria: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
939 def ff(row, crit=orcriteria): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
940 for propname, allowed in crit.items(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
941 val = getattr(row, propname) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
942 if val not in allowed: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
943 return 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
944 return 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
945 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
946 iv = v.filter(ff) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
947 v = v.remapwith(iv) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
948 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
949 #print "filter orcrit at %s" % time.time() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
950 if regexes: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
951 def ff(row, r=regexes): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
952 for propname, regex in r.items(): |
|
1392
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
953 val = str(getattr(row, propname)) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
954 if not regex.search(val): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
955 return 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
956 return 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
957 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
958 iv = v.filter(ff) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
959 v = v.remapwith(iv) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
960 #print "filter regexs at %s" % time.time() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
961 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
962 if sort or group: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
963 sortspec = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
964 rev = [] |
| 1002 | 965 for dir, propname in group, sort: |
| 966 if propname is None: continue | |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
967 isreversed = 0 |
| 1002 | 968 if dir == '-': |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
969 isreversed = 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
970 try: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
971 prop = getattr(v, propname) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
972 except AttributeError: |
|
926
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
973 print "MK has no property %s" % propname |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
974 continue |
|
926
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
975 propclass = self.ruprops.get(propname, None) |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
976 if propclass is None: |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
977 propclass = self.privateprops.get(propname, None) |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
978 if propclass is None: |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
979 print "Schema has no property %s" % propname |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
980 continue |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
981 if isinstance(propclass, hyperdb.Link): |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
982 linkclass = self.db.getclass(propclass.classname) |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
983 lv = linkclass.getview() |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
984 lv = lv.rename('id', propname) |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
985 v = v.join(lv, prop, 1) |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
986 if linkclass.getprops().has_key('order'): |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
987 propname = 'order' |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
988 else: |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
989 propname = linkclass.labelprop() |
|
3216c4f06ec4
Fixes to the search form and saving queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
919
diff
changeset
|
990 prop = getattr(v, propname) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
991 if isreversed: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
992 rev.append(prop) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
993 sortspec.append(prop) |
|
874
b9da8729d8ff
Fix bug in setting activity.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
872
diff
changeset
|
994 v = v.sortrev(sortspec, rev)[:] #XXX Metakit bug |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
995 #print "filter sort at %s" % time.time() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
996 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
997 rslt = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
998 for row in v: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
999 id = str(row.id) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1000 if search_matches is not None: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1001 if search_matches.has_key(id): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1002 rslt.append(id) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1003 else: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1004 rslt.append(id) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1005 return rslt |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1006 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1007 def hasnode(self, nodeid): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1008 return int(nodeid) < self.maxid |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1009 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1010 def labelprop(self, default_to_id=0): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1011 ''' Return the property name for a label for the given node. |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1012 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1013 This method attempts to generate a consistent label for the node. |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1014 It tries the following in order: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1015 1. key property |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1016 2. "name" property |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1017 3. "title" property |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1018 4. first property from the sorted property name list |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1019 ''' |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1020 k = self.getkey() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1021 if k: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1022 return k |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1023 props = self.getprops() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1024 if props.has_key('name'): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1025 return 'name' |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1026 elif props.has_key('title'): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1027 return 'title' |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1028 if default_to_id: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1029 return 'id' |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1030 props = props.keys() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1031 props.sort() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1032 return props[0] |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1033 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1034 def stringFind(self, **requirements): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1035 """Locate a particular node by matching a set of its String |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1036 properties in a caseless search. |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1037 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1038 If the property is not a String property, a TypeError is raised. |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1039 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1040 The return is a list of the id of all nodes that match. |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1041 """ |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1042 for propname in requirements.keys(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1043 prop = self.properties[propname] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1044 if isinstance(not prop, hyperdb.String): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1045 raise TypeError, "'%s' not a String property"%propname |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1046 requirements[propname] = requirements[propname].lower() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1047 requirements['_isdel'] = 0 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1048 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1049 l = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1050 for row in self.getview().select(requirements): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1051 l.append(str(row.id)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1052 return l |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1053 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1054 def addjournal(self, nodeid, action, params): |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1055 self.db.addjournal(self.classname, nodeid, action, params) |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1056 |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1057 def index(self, nodeid): |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1058 ''' Add (or refresh) the node to search indexes ''' |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1059 # find all the String properties that have indexme |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1060 for prop, propclass in self.getprops().items(): |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1061 if isinstance(propclass, hyperdb.String) and propclass.indexme: |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1062 # index them under (classname, nodeid, property) |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1063 self.db.indexer.add_text((self.classname, nodeid, prop), |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1064 str(self.get(nodeid, prop))) |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1065 |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1066 def export_list(self, propnames, nodeid): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1067 ''' Export a node - generate a list of CSV-able data in the order |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1068 specified by propnames for the given node. |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1069 ''' |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1070 properties = self.getprops() |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1071 l = [] |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1072 for prop in propnames: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1073 proptype = properties[prop] |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1074 value = self.get(nodeid, prop) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1075 # "marshal" data where needed |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1076 if value is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1077 pass |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1078 elif isinstance(proptype, hyperdb.Date): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1079 value = value.get_tuple() |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1080 elif isinstance(proptype, hyperdb.Interval): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1081 value = value.get_tuple() |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1082 elif isinstance(proptype, hyperdb.Password): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1083 value = str(value) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1084 l.append(repr(value)) |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1085 |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1086 # append retired flag |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1087 l.append(self.is_retired(nodeid)) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1088 |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1089 return l |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1090 |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1091 def import_list(self, propnames, proplist): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1092 ''' Import a node - all information including "id" is present and |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1093 should not be sanity checked. Triggers are not triggered. The |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1094 journal should be initialised using the "creator" and "creation" |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1095 information. |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1096 |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1097 Return the nodeid of the node imported. |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1098 ''' |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1099 if self.db.journaltag is None: |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1100 raise hyperdb.DatabaseError, 'Database open read-only' |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1101 properties = self.getprops() |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1102 |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1103 d = {} |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1104 view = self.getview(1) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1105 for i in range(len(propnames)): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1106 value = eval(proplist[i]) |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1107 if not value: |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1108 continue |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1109 |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1110 propname = propnames[i] |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1111 if propname == 'id': |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1112 newid = value = int(value) |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1113 elif propname == 'is retired': |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1114 # is the item retired? |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1115 if int(value): |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1116 d['_isdel'] = 1 |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1117 continue |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1118 |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1119 prop = properties[propname] |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1120 if isinstance(prop, hyperdb.Date): |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1121 value = int(calendar.timegm(value)) |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1122 elif isinstance(prop, hyperdb.Interval): |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1123 value = str(date.Interval(value)) |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1124 elif isinstance(prop, hyperdb.Number): |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1125 value = int(value) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1126 elif isinstance(prop, hyperdb.Boolean): |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1127 value = int(value) |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1128 elif isinstance(prop, hyperdb.Link) and value: |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1129 value = int(value) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1130 elif isinstance(prop, hyperdb.Multilink): |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1131 # we handle multilinks separately |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1132 continue |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1133 d[propname] = value |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1134 |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1135 # possibly make a new node |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1136 if not d.has_key('id'): |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1137 d['id'] = newid = self.maxid |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1138 self.maxid += 1 |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1139 |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1140 # save off the node |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1141 view.append(d) |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1142 |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1143 # fix up multilinks |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1144 ndx = view.find(id=newid) |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1145 row = view[ndx] |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1146 for i in range(len(propnames)): |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1147 value = eval(proplist[i]) |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1148 propname = propnames[i] |
|
1496
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1149 if propname == 'is retired': |
|
e6ac4e074acb
relaxed CVS importing (feature [SF#693277])
Richard Jones <richard@users.sourceforge.net>
parents:
1484
diff
changeset
|
1150 continue |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1151 prop = properties[propname] |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1152 if not isinstance(prop, hyperdb.Multilink): |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1153 continue |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1154 sv = getattr(row, propname) |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1155 for entry in value: |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1156 sv.append(int(entry)) |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1157 |
|
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1158 self.db.dirty = 1 |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1159 creator = d.get('creator', 0) |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1160 creation = d.get('creation', 0) |
|
1484
b3f2484babce
fixes to import/export
Richard Jones <richard@users.sourceforge.net>
parents:
1476
diff
changeset
|
1161 self.db.addjournal(self.classname, str(newid), _CREATE, {}, creator, |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1162 creation) |
|
1177
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1163 return newid |
|
24a1a5de1203
Fix as many of the unit test cases as possible.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1176
diff
changeset
|
1164 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1165 # --- used by Database |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1166 def _commit(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1167 """ called post commit of the DB. |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1168 interested subclasses may override """ |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1169 self.uncommitted = {} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1170 self.rbactions = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1171 self.idcache = {} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1172 def _rollback(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1173 """ called pre rollback of the DB. |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1174 interested subclasses may override """ |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1175 for action in self.rbactions: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1176 action() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1177 self.rbactions = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1178 self.uncommitted = {} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1179 self.idcache = {} |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1180 def _clear(self): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1181 view = self.getview(1) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1182 if len(view): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1183 view[:] = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1184 self.db.dirty = 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1185 iv = self.getindexview(1) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1186 if iv: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1187 iv[:] = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1188 def rollbackaction(self, action): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1189 """ call this to register a callback called on rollback |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1190 callback is removed on end of transaction """ |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1191 self.rbactions.append(action) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1192 # --- internal |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1193 def __getview(self): |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1194 ''' Find the interface for a specific Class in the hyperdb. |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1195 |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1196 This method checks to see whether the schema has changed and |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1197 re-works the underlying metakit structure if it has. |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1198 ''' |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1199 db = self.db._db |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1200 view = db.view(self.classname) |
|
872
bd6211d39328
Saving, running & editing queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
860
diff
changeset
|
1201 mkprops = view.structure() |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1202 |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1203 # if we have structure in the database, and the structure hasn't |
|
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1204 # changed |
|
872
bd6211d39328
Saving, running & editing queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
860
diff
changeset
|
1205 if mkprops and self.db.fastopen: |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1206 return view.ordered(1) |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1207 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1208 # is the definition the same? |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1209 for nm, rutyp in self.ruprops.items(): |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1210 for mkprop in mkprops: |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1211 if mkprop.name == nm: |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1212 break |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1213 else: |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1214 mkprop = None |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1215 if mkprop is None: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1216 break |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1217 if _typmap[rutyp.__class__] != mkprop.type: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1218 break |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1219 else: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1220 return view.ordered(1) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1221 # need to create or restructure the mk view |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1222 # id comes first, so MK will order it for us |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1223 self.db.dirty = 1 |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1224 s = ["%s[id:I" % self.classname] |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1225 for nm, rutyp in self.ruprops.items(): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1226 mktyp = _typmap[rutyp.__class__] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1227 s.append('%s:%s' % (nm, mktyp)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1228 if mktyp == 'V': |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1229 s[-1] += ('[fid:I]') |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1230 s.append('_isdel:I,activity:I,creation:I,creator:I]') |
|
872
bd6211d39328
Saving, running & editing queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
860
diff
changeset
|
1231 v = self.db._db.getas(','.join(s)) |
|
bd6211d39328
Saving, running & editing queries.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
860
diff
changeset
|
1232 self.db.commit() |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1233 return v.ordered(1) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1234 def getview(self, RW=0): |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1235 return self.db._db.view(self.classname).ordered(1) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1236 def getindexview(self, RW=0): |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1237 return self.db._db.view("_%s" % self.classname).ordered(1) |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1238 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1239 def _fetchML(sv): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1240 l = [] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1241 for row in sv: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1242 if row.fid: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1243 l.append(str(row.fid)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1244 return l |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1245 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1246 def _fetchPW(s): |
|
1392
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1247 ''' Convert to a password.Password unless the password is '' which is |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1248 our sentinel for "unset". |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1249 ''' |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1250 if s == '': |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1251 return None |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1252 p = password.Password() |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1253 p.unpack(s) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1254 return p |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1255 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1256 def _fetchLink(n): |
|
1476
5a01e90b7dc9
fixed export/import of retired nodes [SF#685273]
Richard Jones <richard@users.sourceforge.net>
parents:
1467
diff
changeset
|
1257 ''' Return None if the link is 0 - otherwise strify it. |
|
1392
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1258 ''' |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1259 return n and str(n) or None |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1260 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1261 def _fetchDate(n): |
|
1392
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1262 ''' Convert the timestamp to a date.Date instance - unless it's 0 which |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1263 is our sentinel for "unset". |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1264 ''' |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1265 if n == 0: |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1266 return None |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1267 return date.Date(time.gmtime(n)) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1268 |
|
1392
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1269 def _fetchInterval(n): |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1270 ''' Convert to a date.Interval unless the interval is '' which is our |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1271 sentinel for "unset". |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1272 ''' |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1273 if n == '': |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1274 return None |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1275 return date.Interval(n) |
|
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1276 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1277 _converters = { |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1278 hyperdb.Date : _fetchDate, |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1279 hyperdb.Link : _fetchLink, |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1280 hyperdb.Multilink : _fetchML, |
|
1392
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1281 hyperdb.Interval : _fetchInterval, |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1282 hyperdb.Password : _fetchPW, |
|
880
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
1283 hyperdb.Boolean : lambda n: n, |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
1284 hyperdb.Number : lambda n: n, |
|
1392
083cce7840aa
Metakit now passes all unit tests! w00t! (except the Number/Boolean unset)
Richard Jones <richard@users.sourceforge.net>
parents:
1389
diff
changeset
|
1285 hyperdb.String : lambda s: s and str(s) or None, |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1286 } |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1287 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1288 class FileName(hyperdb.String): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1289 isfilename = 1 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1290 |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1291 _typmap = { |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1292 FileName : 'S', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1293 hyperdb.String : 'S', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1294 hyperdb.Date : 'I', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1295 hyperdb.Link : 'I', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1296 hyperdb.Multilink : 'V', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1297 hyperdb.Interval : 'S', |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1298 hyperdb.Password : 'S', |
|
880
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
1299 hyperdb.Boolean : 'I', |
|
de3da99a7c02
Add Number and Boolean types to hyperdb.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
874
diff
changeset
|
1300 hyperdb.Number : 'I', |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1301 } |
|
1442
b42fa71754c9
don't attempt to create FileClass items if no content is supplied
Richard Jones <richard@users.sourceforge.net>
parents:
1431
diff
changeset
|
1302 class FileClass(Class, hyperdb.FileClass): |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1303 ''' like Class but with a content property |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1304 ''' |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1305 default_mime_type = 'text/plain' |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1306 def __init__(self, db, classname, **properties): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1307 properties['content'] = FileName() |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1308 if not properties.has_key('type'): |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1309 properties['type'] = hyperdb.String() |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1310 Class.__init__(self, db, classname, **properties) |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1311 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1312 def get(self, nodeid, propname, default=_marker, cache=1): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1313 x = Class.get(self, nodeid, propname, default, cache) |
|
1417
472c21af7f69
fixed error in indexargs_url (thanks Patrick Ohly)
Richard Jones <richard@users.sourceforge.net>
parents:
1392
diff
changeset
|
1314 poss_msg = 'Possibly an access right configuration problem.' |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1315 if propname == 'content': |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1316 if x.startswith('file:'): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1317 fnm = x[5:] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1318 try: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1319 x = open(fnm, 'rb').read() |
|
1417
472c21af7f69
fixed error in indexargs_url (thanks Patrick Ohly)
Richard Jones <richard@users.sourceforge.net>
parents:
1392
diff
changeset
|
1320 except IOError, (strerror): |
|
472c21af7f69
fixed error in indexargs_url (thanks Patrick Ohly)
Richard Jones <richard@users.sourceforge.net>
parents:
1392
diff
changeset
|
1321 # XXX by catching this we donot see an error in the log. |
|
472c21af7f69
fixed error in indexargs_url (thanks Patrick Ohly)
Richard Jones <richard@users.sourceforge.net>
parents:
1392
diff
changeset
|
1322 return 'ERROR reading file: %s%s\n%s\n%s'%( |
|
472c21af7f69
fixed error in indexargs_url (thanks Patrick Ohly)
Richard Jones <richard@users.sourceforge.net>
parents:
1392
diff
changeset
|
1323 self.classname, nodeid, poss_msg, strerror) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1324 return x |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1325 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1326 def create(self, **propvalues): |
|
1431
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
1327 self.fireAuditors('create', None, propvalues) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1328 content = propvalues['content'] |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1329 del propvalues['content'] |
|
1431
c70068162e64
Altered Class.create() and FileClass.create() methods...
Richard Jones <richard@users.sourceforge.net>
parents:
1417
diff
changeset
|
1330 newid = Class.create_inner(self, **propvalues) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1331 if not content: |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1332 return newid |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1333 nm = bnm = '%s%s' % (self.classname, newid) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1334 sd = str(int(int(newid) / 1000)) |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1335 d = os.path.join(self.db.config.DATABASE, 'files', self.classname, sd) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1336 if not os.path.exists(d): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1337 os.makedirs(d) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1338 nm = os.path.join(d, nm) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1339 open(nm, 'wb').write(content) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1340 self.set(newid, content = 'file:'+nm) |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1341 mimetype = propvalues.get('type', self.default_mime_type) |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1342 self.db.indexer.add_text((self.classname, newid, 'content'), content, |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1343 mimetype) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1344 def undo(fnm=nm, action1=os.remove, indexer=self.db.indexer): |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1345 action1(fnm) |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1346 self.rollbackaction(undo) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1347 return newid |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1348 |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1349 def index(self, nodeid): |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1350 Class.index(self, nodeid) |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1351 mimetype = self.get(nodeid, 'type') |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1352 if not mimetype: |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1353 mimetype = self.default_mime_type |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1354 self.db.indexer.add_text((self.classname, nodeid, 'content'), |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1355 self.get(nodeid, 'content'), mimetype) |
|
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1356 |
|
859
eb924e614934
Fixes for the metakit backend
Richard Jones <richard@users.sourceforge.net>
parents:
854
diff
changeset
|
1357 class IssueClass(Class, roundupdb.IssueClass): |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1358 ''' The newly-created class automatically includes the "messages", |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1359 "files", "nosy", and "superseder" properties. If the 'properties' |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1360 dictionary attempts to specify any of these properties or a |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1361 "creation" or "activity" property, a ValueError is raised. |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1362 ''' |
|
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1363 def __init__(self, db, classname, **properties): |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1364 if not properties.has_key('title'): |
|
831
9a4aa0b107de
Updates to use Richard's cool new indexer.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
822
diff
changeset
|
1365 properties['title'] = hyperdb.String(indexme='yes') |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1366 if not properties.has_key('messages'): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1367 properties['messages'] = hyperdb.Multilink("msg") |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1368 if not properties.has_key('files'): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1369 properties['files'] = hyperdb.Multilink("file") |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1370 if not properties.has_key('nosy'): |
| 1002 | 1371 # note: journalling is turned off as it really just wastes |
| 1372 # space. this behaviour may be overridden in an instance | |
| 1373 properties['nosy'] = hyperdb.Multilink("user", do_journal="no") | |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1374 if not properties.has_key('superseder'): |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1375 properties['superseder'] = hyperdb.Multilink(classname) |
|
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1376 Class.__init__(self, db, classname, **properties) |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1377 |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1378 CURVERSION = 2 |
|
820
d75ce81534db
Metakit backend. Metakit's home is equi4.com.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
diff
changeset
|
1379 |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1380 class Indexer(indexer.Indexer): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1381 disallows = {'THE':1, 'THIS':1, 'ZZZ':1, 'THAT':1, 'WITH':1} |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1382 def __init__(self, path, datadb): |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1383 self.path = os.path.join(path, 'index.mk4') |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1384 self.db = metakit.storage(self.path, 1) |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1385 self.datadb = datadb |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1386 self.reindex = 0 |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1387 v = self.db.view('version') |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1388 if not v.structure(): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1389 v = self.db.getas('version[vers:I]') |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1390 self.db.commit() |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1391 v.append(vers=CURVERSION) |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1392 self.reindex = 1 |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1393 elif v[0].vers != CURVERSION: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1394 v[0].vers = CURVERSION |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1395 self.reindex = 1 |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1396 if self.reindex: |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1397 self.db.getas('ids[tblid:I,nodeid:I,propid:I,ignore:I]') |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1398 self.db.getas('index[word:S,hits[pos:I]]') |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1399 self.db.commit() |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1400 self.reindex = 1 |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1401 self.changed = 0 |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1402 self.propcache = {} |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1403 |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1404 def force_reindex(self): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1405 v = self.db.view('ids') |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1406 v[:] = [] |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1407 v = self.db.view('index') |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1408 v[:] = [] |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1409 self.db.commit() |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1410 self.reindex = 1 |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1411 |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1412 def should_reindex(self): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1413 return self.reindex |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1414 |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1415 def _getprops(self, classname): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1416 props = self.propcache.get(classname, None) |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1417 if props is None: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1418 props = self.datadb.view(classname).structure() |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1419 props = [prop.name for prop in props] |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1420 self.propcache[classname] = props |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1421 return props |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1422 |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1423 def _getpropid(self, classname, propname): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1424 return self._getprops(classname).index(propname) |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1425 |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1426 def _getpropname(self, classname, propid): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1427 return self._getprops(classname)[propid] |
| 1143 | 1428 |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1429 def add_text(self, identifier, text, mime_type='text/plain'): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1430 if mime_type != 'text/plain': |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1431 return |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1432 classname, nodeid, property = identifier |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1433 tbls = self.datadb.view('tables') |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1434 tblid = tbls.find(name=classname) |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1435 if tblid < 0: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1436 raise KeyError, "unknown class %r"%classname |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1437 nodeid = int(nodeid) |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1438 propid = self._getpropid(classname, property) |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1439 ids = self.db.view('ids') |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1440 oldpos = ids.find(tblid=tblid,nodeid=nodeid,propid=propid,ignore=0) |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1441 if oldpos > -1: |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1442 ids[oldpos].ignore = 1 |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1443 self.changed = 1 |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1444 pos = ids.append(tblid=tblid,nodeid=nodeid,propid=propid) |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1445 |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1446 wordlist = re.findall(r'\b\w{2,25}\b', text.upper()) |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1447 words = {} |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1448 for word in wordlist: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1449 if not self.disallows.has_key(word): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1450 words[word] = 1 |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1451 words = words.keys() |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1452 |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1453 index = self.db.view('index').ordered(1) |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1454 for word in words: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1455 ndx = index.find(word=word) |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1456 if ndx < 0: |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1457 index.append(word=word) |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1458 ndx = index.find(word=word) |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1459 index[ndx].hits.append(pos=pos) |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1460 self.changed = 1 |
| 1143 | 1461 |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1462 def find(self, wordlist): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1463 hits = None |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1464 index = self.db.view('index').ordered(1) |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1465 for word in wordlist: |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1466 word = word.upper() |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1467 if not 2 < len(word) < 26: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1468 continue |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1469 ndx = index.find(word=word) |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1470 if ndx < 0: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1471 return {} |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1472 if hits is None: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1473 hits = index[ndx].hits |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1474 else: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1475 hits = hits.intersect(index[ndx].hits) |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1476 if len(hits) == 0: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1477 return {} |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1478 if hits is None: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1479 return {} |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1480 rslt = {} |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1481 ids = self.db.view('ids').remapwith(hits) |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1482 tbls = self.datadb.view('tables') |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1483 for i in range(len(ids)): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1484 hit = ids[i] |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1485 if not hit.ignore: |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1486 classname = tbls[hit.tblid].name |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1487 nodeid = str(hit.nodeid) |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1488 property = self._getpropname(classname, hit.propid) |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1489 rslt[i] = (classname, nodeid, property) |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1490 return rslt |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1491 |
|
892
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1492 def save_index(self): |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1493 if self.changed: |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1494 self.db.commit() |
|
44eb237a8b3e
An indexer that uses Metakit for storage.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
880
diff
changeset
|
1495 self.changed = 0 |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1496 |
|
1243
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1497 def rollback(self): |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1498 if self.changed: |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1499 self.db.rollback() |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1500 self.db = metakit.storage(self.path, 1) |
|
3a028d2f7830
Fix (re)indexing & find in back_metakit.
Gordon B. McMillan <gmcm@users.sourceforge.net>
parents:
1232
diff
changeset
|
1501 self.changed = 0 |
|
1333
80d27b7d6db5
implemented whole-database locking
Richard Jones <richard@users.sourceforge.net>
parents:
1249
diff
changeset
|
1502 |
