Revision 93127325 snf-pithos-app/pithos/api/public.py

b/snf-pithos-app/pithos/api/public.py
67 67 
    #                       badRequest (400)
68 68
69 69 
    try:
70 
        v_account, v_container, v_object = request.backend.get_public(request.user_uniq,
70 
        v_account, v_container, v_object = request.backend.get_public(request.userid,
71 71 
                                                    decode_url(v_public))
72 
        meta = request.backend.get_object_meta(request.user_uniq, v_account,
72 
        meta = request.backend.get_object_meta(request.userid, v_account,
73 73 
                                                    v_container, v_object, 'pithos')
74 
        public = request.backend.get_object_public(request.user_uniq, v_account,
74 
        public = request.backend.get_object_public(request.userid, v_account,
75 75 
                                                    v_container, v_object)
76 76 
    except:
77 77 
        raise ItemNotFound('Object does not exist')
......
95 95 
    #                       notModified (304)
96 96
97 97 
    try:
98 
        v_account, v_container, v_object = request.backend.get_public(request.user_uniq,
98 
        v_account, v_container, v_object = request.backend.get_public(request.userid,
99 99 
                                                    decode_url(v_public))
100 
        meta = request.backend.get_object_meta(request.user_uniq, v_account,
100 
        meta = request.backend.get_object_meta(request.userid, v_account,
101 101 
                                                    v_container, v_object, 'pithos')
102 
        public = request.backend.get_object_public(request.user_uniq, v_account,
102 
        public = request.backend.get_object_public(request.userid, v_account,
103 103 
                                                    v_container, v_object)
104 104 
    except:
105 105 
        raise ItemNotFound('Object does not exist')
......
122 122 
    if 'X-Object-Manifest' in meta:
123 123 
        try:
124 124 
            src_container, src_name = split_container_object_string('/' + meta['X-Object-Manifest'])
125 
            objects = request.backend.list_objects(request.user_uniq, v_account,
125 
            objects = request.backend.list_objects(request.userid, v_account,
126 126 
                                src_container, prefix=src_name, virtual=False)
127 127 
        except:
128 128 
            raise ItemNotFound('Object does not exist')
129 129
130 130 
        try:
131 131 
            for x in objects:
132 
                s, h = request.backend.get_object_hashmap(request.user_uniq,
132 
                s, h = request.backend.get_object_hashmap(request.userid,
133 133 
                                        v_account, src_container, x[0], x[1])
134 134 
                sizes.append(s)
135 135 
                hashmaps.append(h)
......
137 137 
            raise ItemNotFound('Object does not exist')
138 138 
    else:
139 139 
        try:
140 
            s, h = request.backend.get_object_hashmap(request.user_uniq, v_account,
140 
            s, h = request.backend.get_object_hashmap(request.userid, v_account,
141 141 
                                                        v_container, v_object)
142 142 
            sizes.append(s)
143 143 
            hashmaps.append(h)

Also available in: Unified diff