Changeset 36110 for main

Timestamp:

2022-03-13T11:37:42+13:00 (2 years ago)

Author:

kjdon

Message:

need to work out servlet_path and site_name in the local (not remote) case too - use build.properties to look for greenstone_default_servlet. Also, move initCollectDir to later on, after we have worked out what the site name is

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (5 diffs)

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

@@ -345 +345 @@
                 // up fedora further below, together with the local tomcat
             }
-            
+                        
             // the no_load flag to GLI is processed at the end of handling open_collection_file_path
             open_collection_file_path = open_collection;
@@ -352 +352 @@
                 "general.open_collection"+Configuration.gliPropertyNameSuffix(), true);
             }
-            
-            initCollectDirectoryPath(); 
+            // we haven't worked out site name yet, so do this step later ...
+            //initCollectDirectoryPath(); 
             
             if (no_load || (isGsdlRemote && open_collection_file_path.equals(""))) {
@@ -359 +359 @@
             }
 
-
+            
             // Before calling setProxy, store anything already present
             // Downloading happens on the machine where GLI is running from, even with clientgli
@@ -525 +525 @@
 
                 if (Configuration.servlet_path == null || Configuration.servlet_path.equals("")) {
+                    String my_servlet_path = null;
                     if (isGsdlRemote) {
                     System.err.println("servlet path is null, get new one from remote server");
-                    String my_servlet_path = remoteGreenstoneServer.getDefaultServletPath().trim();
-                    // set site name to match
-                    String my_site_name = servlet_config.getSiteForServlet(my_servlet_path);
-
-                    Configuration.setSiteAndServlet(my_site_name, my_servlet_path);
+                    my_servlet_path = remoteGreenstoneServer.getDefaultServletPath().trim();
                     } else {
-                    // TODO - how do we work out default in local case?
-                    Configuration.servlet_path = servlet_config.getServletPath(Configuration.site_name);
+                    // we need to look up build.properties
+                    System.err.println("servlet path is null, get one from build.properties");
+                    Properties build_props = loadBuildProperties();
+                    my_servlet_path = build_props.getProperty("greenstone.default.servlet", "/library");
+                    build_props = null;
                     }
-                }
-            }
-            
+                    // set site name to match
+                    String my_site_name = servlet_config.getSiteForServlet(my_servlet_path);
+                    System.err.println("setting site and servlet to " +my_site_name+", "+my_servlet_path);
+                    Configuration.setSiteAndServlet(my_site_name, my_servlet_path);
+                    
+                }
+            }
+
+            initCollectDirectoryPath();
             // ensure that a directory called 'cache' exists in the GLI user directory  
             File user_cache_dir = new File(Gatherer.getGLIUserCacheDirectoryPath());
@@ -1336 +1342 @@
     }
 
-
+    static private Properties loadBuildProperties() {
+
+    File buildPropsFile = new File(Configuration.gsdl3_src_path + File.separator + "build.properties");
+    Properties props = null;
+    if(buildPropsFile.exists()) {
+        props = new Properties();
+        try{
+        props.load(new FileInputStream(buildPropsFile));
+        } catch (Exception e) {
+        System.err.println("couldn't load properties "+e.toString());
+        props = null;
+        }
+    }
+    return props;
+    }
 
     /** Prints a warning message about a missing library path, which means the final collection cannot be previewed in the Gatherer.