Changeset 33084 for main/trunk

Timestamp:

2019-05-16T14:40:32+12:00 (5 years ago)

Author:

kjdon

Message:

uid is no longer an attribute of the request. Instead its part of the UserContext. Improvement - if there is a username (=someone has logged in) then use the username as the berry basket key, that way if someone logs in they can see their basket across computers. if no username, use the id as before

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/BerryBasket.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/BerryBasket.java

@@ -98 +98 @@
     {
 
-        String id = request.getAttribute("uid");
-
+      UserContext userContext = new UserContext(request);
+      String id = null;
+      String user_name =userContext.getUsername();
+      if (user_name == null) {
+        id = userContext.getUserID();
+      } else {
+        id = user_name;
+      }
         if (userMap.containsKey(id))
         {
@@ -250 +256 @@
     protected Element processAddItem(Element request)
     {
+
         Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request);
 
@@ -331 +338 @@
     protected Element processDeleteItems(Element request)
     {
+
         Hashtable<String, Hashtable<String, Item>> docsMap = updateDocMap(request);