Changeset 37419

Timestamp:

2023-03-07T11:07:33+13:00 (2 weeks ago)

Author:

davidb

Message:

In the case of webswing, we want the GS3 logged in username, not the backend system username (which is whatever user is running tomcat, not what we want in this cas); some whitespace also introduced

File:

• main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -874 +874 @@
     try {
         Document default_lockfile = XMLTools.parseXMLFile("xml/" + LOCK_FILE, true);
+
         String user_name = System.getProperty("user.name");
+
+        if (Gatherer.isWebswing) {
+        // More helpful to update this to be the username that
+        // is ogged into GS3 to edit the collection
+        user_name = Gatherer.webswingAuthenticator.getUsername();       
+        }
+        
         Element person_element = (Element) XMLTools.getNodeFromNamed(default_lockfile.getDocumentElement(), "User");
         person_element.appendChild(default_lockfile.createTextNode(user_name));
         person_element = null;
         user_name = null;
+
         String machine_name = Utility.getMachineName();
         Element machine_element = (Element) XMLTools.getNodeFromNamed(default_lockfile.getDocumentElement(), "Machine");
@@ -884 +893 @@
         machine_element = null;
         machine_name = null;
+
         String date_time = Utility.getDateString();
         Element date_element = (Element) XMLTools.getNodeFromNamed(default_lockfile.getDocumentElement(), "Date");
@@ -889 +899 @@
         date_element = null;
         date_time = null;
+
         XMLTools.writeXMLFile(lock_file, default_lockfile);
     }