Changeset 34158

Timestamp:

2020-06-12T23:47:19+12:00 (4 years ago)

Author:

ak19

Message:

Fixing discovery of client-gli issues with previewing a different library (e.g. /default-library instead of /library). This commit adds to Kathy's recent work on supporting other libraries when previewing especially in the remote case, where Diego had detected problems. 1. First fixed a foolish copy paste error I made last time in full-rebuild.pl, commit 34128, when I was fixing up the script to accept the library_name parameter so it could pass this to buildcol.pl calling activate and/or to activate.pl directly. Only detected the problem when I was going to copy paste it into incremental-rebuild.pl. 2. Similar solution added to incremental-rebuild.pl and tested from commandline that this script too now accepts and passes on the library_name parameter to buildcol.pl to reach activate when needed. 3. GLI now passes library_name to building process, so activate can call the correct library to activate a collection. The library_name is obtained from client-gli, where the library (servlet_path) is set when configuring the site in use.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (3 diffs)
• greenstone2/bin/script/full-rebuild.pl (modified) (1 diff)
• greenstone2/bin/script/incremental-rebuild.pl (modified) (1 diff)

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

@@ -234 +234 @@
         command_parts_list.add("-collectdir");
         command_parts_list.add(getCollectDirectory()); // <../collect/>
+    } else { // actually this should work in local Greenstone case too:
+        command_parts_list.add("-library_name");
+        String library_servlet_name = Configuration.servlet_path;
+        if(library_servlet_name.startsWith("/")) {
+        library_servlet_name = library_servlet_name.substring(1);
+        }
+        command_parts_list.add(library_servlet_name);
     }
 
@@ -291 +298 @@
         import_list.add(getCollectDirectory());
     }
+    // import.pl does not at present need to know the library/servlet_path
+    // whether in a remote or local GS server situation
 
     String[] import_options = collection.import_options.getValues();
@@ -338 +347 @@
         build_list.add("-collectdir");
         build_list.add(getCollectDirectory());
+    } else { // actually this should work in local Greenstone case too:
+        build_list.add("-library_name");
+        String library_servlet_name = Configuration.servlet_path;
+        if(library_servlet_name.startsWith("/")) {
+        library_servlet_name = library_servlet_name.substring(1);
+        }
+        build_list.add(library_servlet_name);
     }
 

main/trunk/greenstone2/bin/script/full-rebuild.pl

@@ -131 +131 @@
         # we want buildcol.pl to send it to activate if running buildcol.pl with -activate
         # And we want activate.pl to get it if running activate.pl
-        $build_dir = shift @argv;
-        push(@buildcol_argv,$arg,$build_dir);
-        push(@activate_argv,$arg,$build_dir);
+        my $library_info = shift @argv;
+        push(@buildcol_argv,$arg,$library_info);
+        push(@activate_argv,$arg,$library_info);
     }
     elsif ($arg =~ "-OIDtype") {

main/trunk/greenstone2/bin/script/incremental-rebuild.pl

@@ -105 +105 @@
         push(@buildcol_argv,$buildcol_arg,$buildcol_val);
     }
+    elsif ($arg eq "-library_url" || $arg eq "-library_name") {
+        # only makes sense in buildcol.pl as -activate could
+        # have been passed in then. And if so, then activate.pl will be
+        # called by buildcol.pl which will pass on library_url/library_name
+        # to activate.pl
+        my $library_info = shift @argv;
+        push(@buildcol_argv,$arg,$library_info);
+    }
     elsif ($arg =~ "-OIDtype") {
         shift @argv; # skip OIDtype (don't pass OIDtype to buildcol.pl. It's not currently accepted.)