Changeset 34168 for main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2020-06-14T02:34:57+12:00 (4 years ago)

Author:

ak19

Message:

Stupid oversight on my part yesterday: when fixing up client-GLI so that it could use a variable library servlet (whichever is the current one, instead of always the default 'library') to contact when activating a collection, I should have thought of fixing it for the local GLI with local Greenstone case too. Fortunately caught a possible bug in my previous fix related to this (svn revision 34158), which would pass the library_name to activate for GS3 as well as GS2. But only GS3 uses library servlets.

File:

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

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -229 +229 @@
         command_parts_list.add("-site");
         command_parts_list.add(Configuration.site_name);
-    }
-
-    if(!Gatherer.isGsdlRemote) {
-        command_parts_list.add("-collectdir");
-        command_parts_list.add(getCollectDirectory()); // <../collect/>
-    } else { // actually this should work in local Greenstone case too:
+
+        // Whether remote or local, contact the correct (current) library
+        // to actually get this collection activated
         command_parts_list.add("-library_name");
         String library_servlet_name = Configuration.servlet_path;
@@ -242 +239 @@
         command_parts_list.add(library_servlet_name);
     }
+
+    if(!Gatherer.isGsdlRemote) {
+        command_parts_list.add("-collectdir");
+        command_parts_list.add(getCollectDirectory()); // <../collect/>
+    }   
 
     String[] build_options = collection.build_options.getValues();
@@ -342 +344 @@
         build_list.add("-site");
         build_list.add(Configuration.site_name);
-    }
-
-    if(!Gatherer.isGsdlRemote) {
-        build_list.add("-collectdir");
-        build_list.add(getCollectDirectory());
-    } else { // actually this should work in local Greenstone case too:
+
+        // Whether GS is remote or local, contact the correct (current) library
+        // to actually get this collection activated
         build_list.add("-library_name");
         String library_servlet_name = Configuration.servlet_path;
@@ -353 +352 @@
         library_servlet_name = library_servlet_name.substring(1);
         }
-        build_list.add(library_servlet_name);
+        build_list.add(library_servlet_name);       
+    }
+
+    if(!Gatherer.isGsdlRemote) {
+        build_list.add("-collectdir");
+        build_list.add(getCollectDirectory());
     }