Revision 61efb530 pithos/public/functions.py
b/pithos/public/functions.py | ||
---|---|---|
60 | 60 |
# badRequest (400) |
61 | 61 |
|
62 | 62 |
try: |
63 |
meta = request.backend.get_object_meta(request.user, v_account, |
|
63 |
meta = request.backend.get_object_meta(request.user_uniq, v_account,
|
|
64 | 64 |
v_container, v_object) |
65 |
public = request.backend.get_object_public(request.user, v_account, |
|
65 |
public = request.backend.get_object_public(request.user_uniq, v_account,
|
|
66 | 66 |
v_container, v_object) |
67 | 67 |
except: |
68 | 68 |
raise ItemNotFound('Object does not exist') |
... | ... | |
86 | 86 |
# notModified (304) |
87 | 87 |
|
88 | 88 |
try: |
89 |
meta = request.backend.get_object_meta(request.user, v_account, |
|
89 |
meta = request.backend.get_object_meta(request.user_uniq, v_account,
|
|
90 | 90 |
v_container, v_object) |
91 |
public = request.backend.get_object_public(request.user, v_account, |
|
91 |
public = request.backend.get_object_public(request.user_uniq, v_account,
|
|
92 | 92 |
v_container, v_object) |
93 | 93 |
except: |
94 | 94 |
raise ItemNotFound('Object does not exist') |
... | ... | |
111 | 111 |
if 'X-Object-Manifest' in meta: |
112 | 112 |
try: |
113 | 113 |
src_container, src_name = split_container_object_string('/' + meta['X-Object-Manifest']) |
114 |
objects = request.backend.list_objects(request.user, v_account, |
|
114 |
objects = request.backend.list_objects(request.user_uniq, v_account,
|
|
115 | 115 |
src_container, prefix=src_name, virtual=False) |
116 | 116 |
except: |
117 | 117 |
raise ItemNotFound('Object does not exist') |
118 | 118 |
|
119 | 119 |
try: |
120 | 120 |
for x in objects: |
121 |
s, h = request.backend.get_object_hashmap(request.user, |
|
121 |
s, h = request.backend.get_object_hashmap(request.user_uniq,
|
|
122 | 122 |
v_account, src_container, x[0], x[1]) |
123 | 123 |
sizes.append(s) |
124 | 124 |
hashmaps.append(h) |
... | ... | |
126 | 126 |
raise ItemNotFound('Object does not exist') |
127 | 127 |
else: |
128 | 128 |
try: |
129 |
s, h = request.backend.get_object_hashmap(request.user, v_account, |
|
129 |
s, h = request.backend.get_object_hashmap(request.user_uniq, v_account,
|
|
130 | 130 |
v_container, v_object) |
131 | 131 |
sizes.append(s) |
132 | 132 |
hashmaps.append(h) |
Also available in: Unified diff