Mercurial > p > roundup > code
annotate roundup/cgi/MultiMapping.py @ 3696:790363e96852
Sorting/grouping by multiple properties.
- Implement sorting/grouping by multiple properties for the web
interface. I'm now using @sort0/@sortdir0,@sort1/@sortdir1,... and
@group0/@groupdir0,... when generating URLs from a search template.
These are converted to a list internally. When saving URLs (e.g. when
storing queries) I'm using @sort=prop1,prop2,... and @group=... with
optional '-' prepended to individual props.
This means saved URLs are backward compatible with existing trackers
(and yes, this was a design goal).
I need the clumsy version with @sort0,@sort1 etc, because I'm
currently using several selectors and checkboxes (as the classic
template does, too). I don't think there is a way around that in HTML?
- Updated (hopefully all) documentation to reflect the new URL format
and the consequences in the web-interface.
- I've set the number of sort/group properties in the classic template
to two -- this can easily be reverted by changing n_sort to 1.
Richard, would you look over these changes? I've set a tag before and
(will set) after commit, so that it would be easy to merge out.
Don't be too scared about the size of the change, most is documentation,
the guts are in cgi/templating.py and small changes in the classic
template.
| author | Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net> |
|---|---|
| date | Wed, 30 Aug 2006 20:28:26 +0000 |
| parents | 53c600091f17 |
| children |
| rev | line source |
|---|---|
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1 class MultiMapping: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2 def __init__(self, *stores): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3 self.stores = list(stores) |
|
2162
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
4 self.stores.reverse() |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
5 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
6 def __getitem__(self, key): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
7 for store in self.stores: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
8 if store.has_key(key): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
9 return store[key] |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
10 raise KeyError, key |
|
2162
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
11 |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
12 def __setitem__(self, key, val): |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
13 self.stores[0][key] = val |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
14 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
15 _marker = [] |
|
2162
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
16 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
17 def get(self, key, default=_marker): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
18 for store in self.stores: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
19 if store.has_key(key): |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
20 return store[key] |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
21 if default is self._marker: |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
22 raise KeyError, key |
|
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
23 return default |
|
2162
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
24 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
25 def __len__(self): |
|
2162
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
26 return len(self.items()) |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
27 |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
28 def has_key(self, key): |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
29 for store in self.stores: |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
30 if store.has_key(key): |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
31 return 1 |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
32 return 0 |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
33 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
34 def push(self, store): |
|
2162
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
35 self.stores = [store] + self.stores |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
36 |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
37 def pop(self): |
|
2162
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
38 if not len(self.stores): |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
39 return None |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
40 store, self.stores = self.stores[0], self.stores[1:] |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
41 return store |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
42 |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
43 def keys(self): |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
44 return [ _[0] for _ in self.items() ] |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
45 |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
46 def values(self): |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
47 return [ _[1] for _ in self.items() ] |
|
985
55ab0c5b49f9
New CGI interface support
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
48 |
|
2162
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
49 def copy(self): |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
50 copy = MultiMapping() |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
51 copy.stores = [_.copy() for _ in self.stores] |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
52 return copy |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
53 |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
54 def items(self): |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
55 l = [] |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
56 seen = {} |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
57 for store in self.stores: |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
58 for k, v in store.items(): |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
59 if not seen.has_key(k): |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
60 l.append((k, v)) |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
61 seen[k] = 1 |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
62 return l |
|
53c600091f17
fixed MultiMapping
Richard Jones <richard@users.sourceforge.net>
parents:
985
diff
changeset
|
63 |
