Changeset 28210 for main/trunk/greenstone3

Timestamp:

2013-09-04T15:19:34+12:00 (11 years ago)

Author:

sjm84

Message:

Some fixes for when using the derby database as well as some improvements

Location:

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

Files:

• service/Authentication.java (modified) (16 diffs)
• service/UserTracker.java (modified) (3 diffs)
• util/DerbyWrapper.java (modified) (6 diffs)

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

@@ -128 +128 @@
     protected static final String GET_USER_INFORMATION_SERVICE = "GetUserInformation";
 
-    protected static DerbyWrapper _derbyWrapper = null;
     protected static boolean _derbyWrapperDoneForcedShutdown = false;
 
@@ -157 +156 @@
 
             DerbyWrapper.shutdownDatabaseServer();
-            _derbyWrapper = null;
             _derbyWrapperDoneForcedShutdown = true;
         }
@@ -271 +269 @@
         }
 
-        openDatabase();
+        DerbyWrapper derbyWrapper = openDatabase();
 
         try
         {
-            UserQueryResult userQueryResult = _derbyWrapper.findUser(username);
+            UserQueryResult userQueryResult = derbyWrapper.findUser(username);
 
             Vector<UserTermInfo> terms = userQueryResult.getUserTerms();
@@ -282 +280 @@
             {
                 GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_REQUESTED_USER_NOT_FOUND));
-                closeDatabase();
                 return result;
             }
@@ -308 +305 @@
         }
 
-        closeDatabase();
+        derbyWrapper.closeDatabase();
 
         return result;
@@ -664 +661 @@
             }
 
+            DerbyWrapper derbyWrapper = openDatabase();
             String chpa_groups = retrieveDataForUser(user_name, "groups");
             String chpa_comment = "password_changed_by_user";
-            String info = this._derbyWrapper.modifyUserInfo(user_name, hashPassword(newPassword), chpa_groups, null, chpa_comment, null);
+            String info = derbyWrapper.modifyUserInfo(user_name, hashPassword(newPassword), chpa_groups, null, chpa_comment, null);
+            derbyWrapper.closeDatabase();
             if (info != "succeed")
             {//see DerbyWrapper.modifyUserInfo
@@ -820 +819 @@
     private void checkAdminUserExists()
     {
-        openDatabase();
-
-        UserQueryResult userQueryResult = _derbyWrapper.findUser(null, null);
+        DerbyWrapper derbyWrapper = openDatabase();
+        UserQueryResult userQueryResult = derbyWrapper.findUser(null, null);
+        derbyWrapper.closeDatabase();
 
         if (userQueryResult != null)
@@ -842 +841 @@
             }
         }
-
-        closeDatabase();
-    }
-
-    private boolean openDatabase()
-    {
-        if (_derbyWrapper == null)
-        {
-            // check the usersDb database, if it isn't existing, check the etc dir, create the etc dir if it isn't existing, then create the  user database and add a "admin" user
-            String usersDB_dir = GlobalProperties.getGSDL3Home() + File.separatorChar + "etc" + File.separatorChar + "usersDB";
-
-            _derbyWrapper = new DerbyWrapper(usersDB_dir);
-
-            File usersDB_file = new File(usersDB_dir);
-            if (!usersDB_file.exists())
-            {
-                String etc_dir = GlobalProperties.getGSDL3Home() + File.separatorChar + "etc";
-                File etc_file = new File(etc_dir);
-                if (!etc_file.exists())
-                {
-                    boolean success = etc_file.mkdir();
-                    if (!success)
-                    {
-                        logger.error("Couldn't create the etc dir under " + GlobalProperties.getGSDL3Home() + ".");
-                        return false;
-                    }
-                }
-                _derbyWrapper.createDatabase();
-            }
-        }
-
-        return true;
-    }
-
-    private void closeDatabase()
-    {
-        if (_derbyWrapper != null)
-        {
-            _derbyWrapper.closeDatabase();
-            _derbyWrapper = null;
-        }
+    }
+
+    private DerbyWrapper openDatabase()
+    {
+        // check the usersDb database, if it isn't existing, check the etc dir, create the etc dir if it isn't existing, then create the  user database and add a "admin" user
+        String usersDB_dir = GlobalProperties.getGSDL3Home() + File.separatorChar + "etc" + File.separatorChar + "usersDB";
+
+        DerbyWrapper derbyWrapper = new DerbyWrapper(usersDB_dir);
+
+        File usersDB_file = new File(usersDB_dir);
+        if (!usersDB_file.exists())
+        {
+            String etc_dir = GlobalProperties.getGSDL3Home() + File.separatorChar + "etc";
+            File etc_file = new File(etc_dir);
+            if (!etc_file.exists())
+            {
+                boolean success = etc_file.mkdir();
+                if (!success)
+                {
+                    logger.error("Couldn't create the etc dir under " + GlobalProperties.getGSDL3Home() + ".");
+                    return null;
+                }
+            }
+            derbyWrapper.createDatabase();
+        }
+
+        return derbyWrapper;
     }
 
     private int addUserInformationToNode(String username, Element serviceNode)
     {
-        openDatabase();
-
-        UserQueryResult userQueryResult = _derbyWrapper.findUser(username, null);
+        DerbyWrapper derbyWrapper = openDatabase();
+        UserQueryResult userQueryResult = derbyWrapper.findUser(username, null);
+        derbyWrapper.closeDatabase();
 
         if (userQueryResult != null)
@@ -895 +880 @@
             Element user_node = getUserNode(userQueryResult);
             serviceNode.appendChild(user_node);
-            closeDatabase();
             return NO_ERROR;
         }
 
-        closeDatabase();
         return ERROR_COULD_NOT_GET_USER_INFO;
     }
@@ -910 +893 @@
         }
 
-        openDatabase();
-
-        boolean success = _derbyWrapper.deleteUser(username);
+        DerbyWrapper derbyWrapper = openDatabase();
+        boolean success = derbyWrapper.deleteUser(username);
+        derbyWrapper.closeDatabase();
 
         if (success)
         {
-            closeDatabase();
             return NO_ERROR;
         }
 
-        closeDatabase();
         return ERROR_REMOVING_USER;
     }
@@ -926 +907 @@
     private int addUser(String newUsername, String newPassword, String newGroups, String newStatus, String newComment, String newEmail)
     {
-        openDatabase();
-
         newGroups = newGroups.replaceAll(" ", "");
 
         //Check if the user already exists
-        UserQueryResult userQueryResult = _derbyWrapper.findUser(newUsername, null);
+        DerbyWrapper derbyWrapper = openDatabase();
+        UserQueryResult userQueryResult = derbyWrapper.findUser(newUsername, null);
 
         if (userQueryResult != null)
         {
-            closeDatabase();
+            derbyWrapper.closeDatabase();
             return ERROR_USER_ALREADY_EXISTS;
         }
@@ -941 +921 @@
         {
             System.err.println("ADDING " + newUsername + " " + newPassword);
-            boolean success = _derbyWrapper.addUser(newUsername, newPassword, newGroups, newStatus, newComment, newEmail);
+            boolean success = derbyWrapper.addUser(newUsername, newPassword, newGroups, newStatus, newComment, newEmail);
+            derbyWrapper.closeDatabase();
+
             if (!success)
             {
-                closeDatabase();
                 return ERROR_ADDING_USER;
             }
         }
 
-        closeDatabase();
         return NO_ERROR;
     }
@@ -957 +937 @@
         boolean check_status = false;
 
-        openDatabase();
-
+        DerbyWrapper derbyWrapper = openDatabase();
         try
         {
-            UserQueryResult result = _derbyWrapper.findUser(username);
+            UserQueryResult result = derbyWrapper.findUser(username);
 
             if (result != null)
@@ -974 +953 @@
             ex.printStackTrace();
         }
-
-        closeDatabase();
+        derbyWrapper.closeDatabase();
+
         return check_status;
     }
@@ -987 +966 @@
         try
         {
-            UserQueryResult result = _derbyWrapper.findUser(username);
+            DerbyWrapper derbyWrapper = openDatabase();
+            UserQueryResult result = derbyWrapper.findUser(username);
+            derbyWrapper.closeDatabase();
             Vector userInfo = result.users;
 
@@ -1024 +1005 @@
         }
 
-        closeDatabase();
         return data;
     }

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

@@ -90 +90 @@
     protected synchronized Element processGetActivityOnPage(Element request)
     {
-        System.err.println("CALLED");
         Element result = GSXML.createBasicResponse(this.doc, GET_ACTIVITY_ON_PAGE);
         try
@@ -98 +97 @@
             if (paramList == null)
             {
-                System.err.println("WHA?");
                 GSXML.addError(this.doc, result, "Request has no parameter list");
                 return result;
@@ -110 +108 @@
             DerbyWrapper database = new DerbyWrapper(GlobalProperties.getGSDL3Home() + File.separatorChar + "etc" + File.separatorChar + "usersDB");
             ArrayList<HashMap<String, String>> userActions = database.getMostRecentUserActions(site, collection, oid);
-
-            System.err.println(userActions.size());
 
             Element userList = this.doc.createElement("userList");

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

@@ -197 +197 @@
         try
         {
-            String query = "SELECT username, action FROM usertracker WHERE site = '" + site + "' and collection = '" + collection + "' and oid = '" + oid + "' ORDER BY time";
+            String query = "SELECT username, action, time FROM usertracker WHERE site = '" + site + "' and collection = '" + collection + "' and oid = '" + oid + "' ORDER BY time";
             Statement state = conn.createStatement();
             ResultSet rs = state.executeQuery(query);
@@ -203 +203 @@
 
             HashSet<String> usernamesSeen = new HashSet<String>();
-
             while (rs.next())
             {
+                String timeStr = rs.getString("time");
+                long time = Long.parseLong(timeStr);
+
+                if (System.currentTimeMillis() - time > 6000)
+                {
+                    continue;
+                }
+
                 HashMap<String, String> action = new HashMap<String, String>();
                 if (!usernamesSeen.contains(rs.getString("username")))
@@ -217 +224 @@
             }
             state.close();
+
+            clearOldUserActions();
         }
         catch (Exception ex)
@@ -223 +232 @@
         }
         return actions;
+    }
+
+    public void clearOldUserActions()
+    {
+        try
+        {
+            Statement state = conn.createStatement();
+            state.execute("DELETE FROM usertracker WHERE (CAST (time AS BIGINT)) < " + (System.currentTimeMillis() - 20000));
+            conn.commit();
+            state.close();
+        }
+        catch (Exception ex)
+        {
+            ex.printStackTrace();
+        }
     }
 
@@ -572 +596 @@
         Statement state = conn.createStatement();
         ResultSet rs = state.executeQuery(sql_find_user);
+        conn.commit();
         while (rs.next())
         {
@@ -583 +608 @@
             users.add(user);
         }
-        conn.commit();
-
+        state.close();
+
+        state = conn.createStatement();
         for (HashMap<String, String> user : users)
         {
             ResultSet gs = state.executeQuery("SELECT role FROM " + ROLES + " WHERE username = '" + user.get("username") + "'");
+            conn.commit();
 
             String group = "";