Changeset 37355

Timestamp:

2023-02-25T15:30:16+13:00 (3 weeks ago)

Author:

davidb

Message:

Addition to code: if the '-load' file specified is relative, then it prepends the collect_dir. A complication here is that collect_dir as a member field isn't set yet, and so we have to check ourselves if we are in the situation of a custom collect dir provided on the command-line, or else going to be usesing the default one

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

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

@@ -401 +401 @@
                 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 ...