Changeset 35303

Timestamp:

2021-08-17T14:42:15+12:00 (3 years ago)

Author:

anupama

Message:

1. In trying to hunt down where UserTermInfo's toString() and UserQueryResult's toString() get called and what value for groups they need to be displaying (expandedGroups or compactedGroups which is closest to user-entered data), found that UserQueryResult.users was public, despite there being a method getUserTerms() that returns this. So made it a private member and updated code to call the method at all times. In the end I didn't locate anywhere in the code that the aforementioned toString() methods got called, DerbyWrapper.java's db2txt() methods print out the fields direct from the DB in their own formatting, and is called by userDB2txt.java. At the moment, the code is set to print out the expandedGroups for the groups value of any UserTermInfo. 2. Fixed a bug due to oversight in UserTermInfo.java's compactGroups(String groups) and expandedGroups(String groups) to handle when groups is null. Returning empty string then, also used to initialise the compactedGroups and expandedGroups member vars.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• service/Authentication.java (modified) (3 diffs)
• util/UserQueryResult.java (modified) (1 diff)
• util/UserTermInfo.java (modified) (2 diffs)

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

@@ -1079 +1079 @@
         if (userQueryResult != null)
         {
-            Vector userInfo = userQueryResult.users;
+            Vector userInfo = userQueryResult.getUserTerms();
 
             boolean adminFound = false;
@@ -1206 +1206 @@
             UserQueryResult result = derbyWrapper.findUser(username);
             derbyWrapper.closeDatabase();
-            Vector userInfo = result.users;
+            Vector userInfo = result.getUserTerms();
 
             for (int i = 0; i < result.getSize(); i++)
@@ -1254 +1254 @@
         Element user_list_node = doc.createElement(GSXML.USER_NODE_ELEM + GSXML.LIST_MODIFIER);
 
-        Vector userInfo = userQueryResult.users;
+        Vector userInfo = userQueryResult.getUserTerms();
 
         for (int i = 0; i < userQueryResult.getSize(); i++)

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

@@ -25 +25 @@
 {
     /** the list of UserInfo */
-    public Vector<UserTermInfo> users = null;
+    private Vector<UserTermInfo> users = null;
 
     UserQueryResult()

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

@@ -113 +113 @@
      */
     public static String compactGroups(String groups) {
-    if(groups.indexOf('.') == -1) {
+    if(groups == null) {
+        return "";
+    }
+    else if(groups.indexOf('.') == -1) {
         return groups;
     }
@@ -198 +201 @@
      */
     public static String expandGroups(String groups) {
-    if(groups.indexOf('.') == -1) {
+    if(groups == null) {
+        return "";
+    } else if(groups.indexOf('.') == -1) {
         return groups;
     }