Changeset 36105

Timestamp:

2022-03-11T10:38:01+13:00 (2 years ago)

Author:

kjdon

Message:

some commits around handling servlet path - if teh gliserver url is not the same as the pne we stored previously, then clear out the saved site and servlet info - they might be wrong, and if the servlet path is not valid, you can't authenticate, and can't open gli at all. if we have no serv;et path, get one from remote server, and then find out what its site is.

File:

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

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

@@ -380 +380 @@
 
                 int greenstoneVersion = 2;
-                requestGLIServerURL();
+                String prev_gliserver_url_string = Configuration.getString("general.gliserver_url", true);
+                requestGLIServerURL(); // opens up the gliserver dialog
                 gliserver_url_string = Configuration.gliserver_url.toString();
+                
                 
                 greenstoneVersion = remoteGreenstoneServer.getGreenstoneVersion();
@@ -391 +393 @@
                 if(greenstoneVersion >= 3) {
                     this.GS3 = true;
-                    Configuration.prepareForGS3();
+                    if (!prev_gliserver_url_string.equals(gliserver_url_string)) {
+                        System.err.println("Using a new GLI server url, clear site and servlet info");
+                        Configuration.setSiteAndServlet("", "");
+                    } else {
+                        Configuration.prepareForGS3();
+                    }
                 } 
                 
@@ -494 +501 @@
 
             // The "-gliserver_url" option overwrites anything in the config files
+            // why do this? we have already asked the user for gliserver url and set it...
             if (gliserver_url_string != null && gliserver_url_string.length() > 0) {
                 try {
@@ -514 +522 @@
                     servlet_config= new ServletConfiguration(gsdl3_path);
                 }
-            }
-
-            if (GS3 && Configuration.servlet_path == null) {
-                Configuration.servlet_path = servlet_config.getServletPath(Configuration.site_name);
+            
+
+                if (Configuration.servlet_path == null || Configuration.servlet_path.equals("")) {
+                    if (isGsdlRemote) {
+                    System.err.println("servlet path is null, get new one from remote server");
+                    String my_servlet_path = remoteGreenstoneServer.getDefaultServletPath().trim();
+                    // set site name to match
+                    String my_site_name = servlet_config.getSiteForServlet(my_servlet_path);
+
+                    Configuration.setSiteAndServlet(my_site_name, my_servlet_path);
+                    } else {
+                    // TODO - how do we work out default in local case?
+                    Configuration.servlet_path = servlet_config.getServletPath(Configuration.site_name);
+                    }
+                }
             }
             
@@ -1406 +1425 @@
         WarningDialog dialog;
         String[] defaultURLs = {
-            "http://localhost:8080/greenstone3/cgi-bin/gliserver.pl", 
+            "http://localhost:8383/greenstone3/cgi-bin/gliserver.pl", 
             "http://localhost:8080/gsdl/cgi-bin/gliserver.pl"
         };