Changeset 35266 for main/trunk/greenstone3/src/java

Timestamp:

2021-08-09T13:42:09+12:00 (3 years ago)

Author:

kjdon

Message:

when running my new local twso library, it ran into trouble. My collection was twso, and my library name was also twso. It ended up with greenstone3/collection/twso as the baseURL. The baseURL should be everyhting up to the library name. The problem occurs when the library_name appears in the domain name, or elsewhere in the url (in my case as the collection name). Can't use teh first or the last occurence of library_name, due to these cases. So now, lets test for /library-name, but also check to make sure thats not the start of the domain name, eg if had library.waikato.ac.nz/greenstone3/library.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -462 +462 @@
     String requestedURL = request.getRequestURL().toString();
     String baseURL = "";
+    //logger.error("requested URL = "+requestedURL);
     if (requestedURL.indexOf(library_name) != -1)
     {
-    baseURL = requestedURL.substring(0, requestedURL.lastIndexOf(library_name));
-    
-    int protocol_boundary_pos = baseURL.indexOf("://");
-    if (protocol_boundary_pos>=1) {
-        baseURL = baseURL.substring(protocol_boundary_pos+1); // change things like http:// or https:// to //
-    }
+      // we need to work out the baseURL and set it
+      baseURL = requestedURL;
+      int protocol_boundary_pos = baseURL.indexOf("://");
+      if (protocol_boundary_pos>=1) {
+        baseURL = baseURL.substring(protocol_boundary_pos+1); // change things like http:// or https:// to //
+      }
+      // The baseURL is everything up to the library_name.
+      // eg https://community.greenstone.org/greenstone3/library/collection/twso/page/about
+      // baseURL is //community.greenstone.org/greenstone3
+      // Issues: the library_name may occur in more than one place - eg if its part of the domain name mylibrary.heritage.nz/greenstone3/library
+      // or if a collection name is the same as the library name eg localhost:8585/greenstone3/twso/collection/twso/page/about.
+      // So can't just use teh first or last occurrence. Look for /library-name, and check its not the first position (eg //library.nzdl.org/greenstone3/library)
+      int library_name_index = baseURL.indexOf("/"+library_name);
+      if (library_name_index == 1) {
+        // we have library name at the start of the url - need to use the second one
+        library_name_index = baseURL.indexOf("/"+library_name, 2);
+      }
+      baseURL = baseURL.substring(0, library_name_index+1);
+      //logger.error("new base url = "+baseURL);
         
     }
+
     String fullURL;
     if (request.getQueryString() != null)