Replace uniq with userid.

[pithos] / snf-pithos-app / pithos / api / public.py

diff --git a/snf-pithos-app/pithos/api/public.py b/snf-pithos-app/pithos/api/public.py
index 06db2ed..a14ba24 100644 (file)
--- a/snf-pithos-app/pithos/api/public.py
+++ b/snf-pithos-app/pithos/api/public.py
@@ -67,11 +67,11 @@ def public_meta(request, v_public):
     #                       badRequest (400)
     
     try:
-        v_account, v_container, v_object = request.backend.get_public(request.user_uniq,
+        v_account, v_container, v_object = request.backend.get_public(request.userid,
                                                     decode_url(v_public))
-        meta = request.backend.get_object_meta(request.user_uniq, v_account,
+        meta = request.backend.get_object_meta(request.userid, v_account,
                                                     v_container, v_object, 'pithos')
-        public = request.backend.get_object_public(request.user_uniq, v_account,
+        public = request.backend.get_object_public(request.userid, v_account,
                                                     v_container, v_object)
     except:
         raise ItemNotFound('Object does not exist')
@@ -95,11 +95,11 @@ def public_read(request, v_public):
     #                       notModified (304)
     
     try:
-        v_account, v_container, v_object = request.backend.get_public(request.user_uniq,
+        v_account, v_container, v_object = request.backend.get_public(request.userid,
                                                     decode_url(v_public))
-        meta = request.backend.get_object_meta(request.user_uniq, v_account,
+        meta = request.backend.get_object_meta(request.userid, v_account,
                                                     v_container, v_object, 'pithos')
-        public = request.backend.get_object_public(request.user_uniq, v_account,
+        public = request.backend.get_object_public(request.userid, v_account,
                                                     v_container, v_object)
     except:
         raise ItemNotFound('Object does not exist')
@@ -122,14 +122,14 @@ def public_read(request, v_public):
     if 'X-Object-Manifest' in meta:
         try:
             src_container, src_name = split_container_object_string('/' + meta['X-Object-Manifest'])
-            objects = request.backend.list_objects(request.user_uniq, v_account,
+            objects = request.backend.list_objects(request.userid, v_account,
                                 src_container, prefix=src_name, virtual=False)
         except:
             raise ItemNotFound('Object does not exist')
         
         try:
             for x in objects:
-                s, h = request.backend.get_object_hashmap(request.user_uniq,
+                s, h = request.backend.get_object_hashmap(request.userid,
                                         v_account, src_container, x[0], x[1])
                 sizes.append(s)
                 hashmaps.append(h)
@@ -137,7 +137,7 @@ def public_read(request, v_public):
             raise ItemNotFound('Object does not exist')
     else:
         try:
-            s, h = request.backend.get_object_hashmap(request.user_uniq, v_account,
+            s, h = request.backend.get_object_hashmap(request.userid, v_account,
                                                         v_container, v_object)
             sizes.append(s)
             hashmaps.append(h)