Changeset 35286 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/ModifyUsersDB.java

Timestamp:

2021-08-12T17:53:14+12:00 (3 years ago)

Author:

anupama

Message:

First commit to do with supporting user groups of the form nz.ac.waikato.cs.pinky or katoa.maori.place.iwi.hapu.person, which need to get expanded out as nz, nz.ac, nz.ac.waikato, nz.ac.waikato.cs, nz.ac.waikato.cs.pinky (no duplicates). 1. Added a function that expands the existing groups and a new member variable to UserTermInfo that holds the expanded groups. 2. As also advised by Dr Bainbridge: refactored the existing UserTermInfo class to have getter and setter functions as needed and constructor so its member vars don't remain public as that also made it hard to track down in which classes/methods these member vars get (re)set. This commit should not have functionally altered the code: the origGroups (and not expandedGroups) is used everywhere still. In a subsequent commit will work out where the expandedGroups need to get used.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/ModifyUsersDB.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/ModifyUsersDB.java

@@ -1 +1 @@
 /*
- *    txt2usersDB.java
+ *    ModifyUsersDB.java
  *    Copyright (C) 2008 New Zealand Digital Library, http://www.nzdl.org
  *
@@ -134 +134 @@
             if (password.equals(""))
             {
-                password = user.password; // already stored hashed-and-hexed in DB
+                password = user.getPassword(); // already stored hashed-and-hexed in DB
             }
             if (groups.equals(""))
             {
-                groups = user.groups;
+                groups = user.getOrigGroups();
             }
             if (accountstatus.equals(""))
             {
-                accountstatus = user.accountstatus.equals("") ? "true" : user.accountstatus;
+                accountstatus = user.getAccountStatus().equals("") ? "true" : user.getAccountStatus();
             }
             if (comment.equals(""))
             {
-                comment = user.comment;
+                comment = user.getComment();
             }
             if (email.equals(""))
             {
-                email = user.email;
+                email = user.getEmail();
             }