Changeset 37420

Timestamp:

2023-03-07T11:45:17+13:00 (14 months ago)

Author:

kjdon

Message:

have moved this block of code to after the bit where we work out site and servlet for gs3. otherwise, when we do specify a collection (eg in webswing gli), we try to make the collection path without knowing the site_name, which doesn't work properly

File:

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

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

@@ -395 +395 @@
                 // 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;
-            if (open_collection_file_path == null) {
-                open_collection_file_path = Configuration.getString(
-                "general.open_collection"+Configuration.gliPropertyNameSuffix(), true);
-            }
-            else {
-                // see if it is expressed as a relative filename, in which case, prepend
-                // collect_directory_path
-                File open_collection_file = new File(open_collection_file_path);
-                if (!open_collection_file.isAbsolute()) {
-                // dealing with a relative dir
-                // => prefix collect_directory_path
-                // but first need to work out this out for ourselves, as standard/non-standard collect_dir
-                // has not yet been determined
-                
-                String resolved_collect_directory_path =
-                    (collect_directory_path != null)
-                    ? collect_directory_path : getDefaultGSCollectDirectoryPath(false);  // false => without dir sep at end
-
-                open_collection_file_path = resolved_collect_directory_path + File.separator + open_collection_file_path;
-                }
-    
-            }
-            // we haven't worked out site name yet, so do this step later ...
-            //initCollectDirectoryPath(); 
-            
-            if (no_load || (isGsdlRemote && open_collection_file_path.equals(""))) {
-                open_collection_file_path = null;
-            }
 
             
@@ -612 +581 @@
                 }
             }
+
+
+            // have we got a specified collection to open?
+            // the no_load flag to GLI is processed at the end of handling open_collection_file_path
+            open_collection_file_path = open_collection;
+            if (open_collection_file_path == null) {
+                open_collection_file_path = Configuration.getString(
+                "general.open_collection"+Configuration.gliPropertyNameSuffix(), true);
+            }
+            else {
+                // see if it is expressed as a relative filename, in which case, prepend
+                // collect_directory_path
+                File open_collection_file = new File(open_collection_file_path);
+                if (!open_collection_file.isAbsolute()) {
+                // dealing with a relative dir
+                // => prefix collect_directory_path
+                // but first need to work out this out for ourselves, as standard/non-standard collect_dir
+                // has not yet been determined
+
+                String resolved_collect_directory_path =
+                    (collect_directory_path != null)
+                    ? collect_directory_path : getDefaultGSCollectDirectoryPath(false);  // false => without dir sep at end
+
+                open_collection_file_path = resolved_collect_directory_path + File.separator + open_collection_file_path;
+                }
+    
+            }
+            
+            if (no_load || (isGsdlRemote && open_collection_file_path.equals(""))) {
+                open_collection_file_path = null;
+            }
+
 
             initCollectDirectoryPath();