Changeset 37330

Timestamp:

2023-02-19T23:52:08+13:00 (4 weeks ago)

Author:

davidb

Message:

GLI code updated to better support webswing: a specific configWebswing.xml file introduced, and Gatherer/GathererProg updated so the area for the user GLI config files is set as <GLIHOME>/webswing-users, with the logged in username then used to form a subdirectory within this area

Location:

main/trunk/gli

Files:

• classes/xml/configWebswing.xml (added)
• src/org/greenstone/gatherer/Gatherer.java (modified) (6 diffs)
• src/org/greenstone/gatherer/GathererProg.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -170 +170 @@
     static private URL default_gliserver_url=null;
     
-    public Gatherer(String[] args) 
+    public Gatherer(GetOpt go) 
     {
         // Display the version to make error reports a lot more useful
@@ -177 +177 @@
         JarTools.initialise(this); 
 
-        GetOpt go = new GetOpt(args);
+        //GetOpt go = new GetOpt(args);
 
         // Remember the GSDLOS value
@@ -246 +246 @@
         }
         else if (isWebswing) {
+            Configuration.template_config_xml = Configuration.TEMPLATE_CONFIG_PREFIX +  Configuration.CONFIG_WEBSWING_XML; 
             Configuration.config_xml = Configuration.CONFIG_WEBSWING_XML;
         }
@@ -266 +267 @@
     }
 
+        public Gatherer(String[] args)
+        {
+        this(new GetOpt(args));
+    }
 
     public void init(String gsdl_path, String gsdl3_path, String gsdl3_src_path, 
@@ -287 +292 @@
             System.exit(0);
         }
+
+        String username = webswingAuthenticator.getUsername();
+
+        // In webswing case, GathererProg does not have a username when it was initializing this
+        String gli_no_username_dir_path = Gatherer.getGLIUserDirectoryPath();
+
+        String gli_user_directory_path = gli_no_username_dir_path  + username + File.separator;
+        
+        File gli_user_directory = new File(gli_user_directory_path);
+        if (!gli_user_directory.exists() && !gli_user_directory.mkdir()) {
+            System.err.println("Warning: Unable to make directory: " + gli_user_directory_path);
+        }
+        else {
+            Gatherer.setGLIUserDirectoryPath(gli_user_directory_path);
+        }
+        
         }
         // Create the debug stream if required
@@ -1976 +1997 @@
         }
 
+        public String getUsername() {
+        return username;
+        }
+
+
         public boolean authenticate(String library_url_string) {
         PasswordAuthentication pa = getPasswordAuthentication();

main/trunk/gli/src/org/greenstone/gatherer/GathererProg.java

@@ -61 +61 @@
     }
 
+    GetOpt go = new GetOpt(args);
+            
     // Determine the GLI user directory path
-    String gli_user_directory_path = System.getProperty("user.home") + File.separator;
-        if (Utility.isWindows()) {
-        gli_user_directory_path += "Application Data" + File.separator + "Greenstone" + File.separator + "GLI" + File.separator;
-        }
-        else {
-            gli_user_directory_path += ".gli" + File.separator;
-        }
+    String gli_user_directory_path = null;
+    if (go.webswing) {
+        if (go.gsdl3_src_path != null) {
+        // above is a (albeit a crude) test at this early stage of running,
+        // that makes sure we're running GS3
+
+        // "user.dir" resolves to the user's current-working-directory
+        // which is engineered through webswing.config to be the GLI home directory     
+        
+        gli_user_directory_path = System.getProperty("user.dir") + File.separator + "webswing-users" + File.separator;
+        
+        //gli_user_directory_path = go.gsdl3_src_path + File.separator;
+        
+        // or GSDL3SRCHOME ???
+        //gli_user_directory_path = System.getProperty("user.dir") + File.separator;
+        //gli_user_directory_path = System.getenv("GSDL3SRCHOME") + File.separator;
+
+        File gli_user_directory = new File(gli_user_directory_path);
+        
+        if (!gli_user_directory.exists() && !gli_user_directory.mkdir()) {
+            System.err.println("Warning: Unable to make directory: " + gli_user_directory_path);
+        }
+        }
+        else {
+        System.err.println("Webswing for Greenstone2 not supported");
+        System.exit(1);
+        }
+    }
+    else {
+        gli_user_directory_path = System.getProperty("user.home") + File.separator;
+
+    
+        if (Utility.isWindows()) {
+        gli_user_directory_path += "Application Data" + File.separator + "Greenstone" + File.separator + "GLI" + File.separator;
+        }
+        else {
+        gli_user_directory_path += ".gli" + File.separator;
+        }
+    }
+    
     Gatherer.setGLIUserDirectoryPath(gli_user_directory_path);
 
@@ -75 +110 @@
     
     // Create an instance of the Gatherer class, which will parse the args and prepare the rest of the GLI
-    final Gatherer gatherer = new Gatherer(args);
+    final Gatherer gatherer = new Gatherer(go);
         
     // TESTING circumventing the old GUI event dispatch thread exceptions in GLI. Follows