Changeset 37330 for main/trunk/gli/src/org/greenstone/gatherer/GathererProg.java

Timestamp:

2023-02-19T23:52:08+13:00 (14 months 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

File:

• main/trunk/gli/src/org/greenstone/gatherer/GathererProg.java (modified) (2 diffs)

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