Changeset 29514 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2014-12-02T18:42:47+13:00 (9 years ago)

Author:

ak19

Message:

Now the collectdir flag passed to gli.sh works (tested with GS3). It wasn't working before. The collectdir flag is needed by Jeremey (jts21) for his linux package manager binaries of GS3, since can't use the default collectdir location. They need to specify a different collectdir as the default one that GLI will launch with.

File:

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

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

@@ -205 +205 @@
 
         // Users may specify a non-standard collect directory (eg. when running one GLI in a network environment)
-        if (go.collect_directory_path != null) {
-            setCollectDirectoryPath(go.collect_directory_path);
-        }
+        // Processing of custom non-standard collect directory passed into gli now happens in init()
+        //if (go.collect_directory_path != null) { setCollectDirectoryPath(go.collect_directory_path); }
 
         // More special code for running with a remote Greenstone
@@ -236 +235 @@
         go.local_library_path, go.library_url_string, 
         go.gliserver_url_string, go.debug, go.perl_path, go.no_load, go.filename, go.site_name,
-        go.servlet_path);
+        go.servlet_path, go.collect_directory_path);
     }
 
@@ -245 +244 @@
     String library_url_string, String gliserver_url_string, boolean debug_enabled,
     String perl_path, boolean no_load, String open_collection, 
-    String site_name, String servlet_path) 
+    String site_name, String servlet_path, String collect_directory_path) 
     {
         if (gsdl3_path != null && !gsdl3_path.equals("")) {
@@ -580 +579 @@
         Classifiers.loadClassifiersList(null);
         Plugins.loadPluginsList(null);
+
+        // Users may specify a non-standard collect directory (eg. when running one GLI in a network environment)
+        // Set to any custom collection directory provided to gli. This happens if gli was run as:
+        // ./gli.sh -collectdir </full/path/to/custom/collect>
+        if(collect_directory_path != null) {
+
+            // create a version of the collect_dir_path without a file-separator at end
+            String collectDir = collect_directory_path; 
+            if(collectDir.endsWith(File.separator)) {
+            collectDir = collectDir.substring(0, collectDir.length()-1); // remove file separator at end
+            }
+
+            // update .gli/config.xml to contain the version of the path without file-separator at end
+            if(collect_directory_path.equals(getDefaultGSCollectDirectoryPath(false))) {
+            Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                        true, "");
+            } else {
+            Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                        true, collectDir);
+            }
+
+            // set non_standard_collect_directory_path variable. Ensures file_separator at end
+            Gatherer.setCollectDirectoryPath(collect_directory_path); 
+
+            // Use version of path without file-separator at end to set collecthome in gsdlsite(3).cfg
+            if(collectDir != null) {
+            collectDir = "\""+collectDir+"\"";
+            }
+            Utility.updatePropertyConfigFile(getGsdlSiteConfigFile(), "collecthome", collectDir);
+            // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return
+        }
 
         // If using a remote Greenstone we need to download the collection configurations now