Changeset 34161

Timestamp:

2020-06-13T08:43:50+12:00 (4 years ago)

Author:

ak19

Message:

Fixed last of the client-gli/remoe GS3 bugs discovered yesterday. When client-gli connects to many different remote GS3 servers, the previously stored site in configRemote.xml may not exist in the next remote GS3 server that the same client-gli will connect to. client-gli must not terminate, as it ends up being an infinite loop of client-GLI terminating. Instead, print a warning and fallback on known sites, which then ends up savin a known site name into configRemot.xml for next time.

File:

• main/trunk/gli/src/org/greenstone/gatherer/remote/RemoteGreenstoneServerAction.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/remote/RemoteGreenstoneServerAction.java

@@ -251 +251 @@
         download_collection_configurations_command += "&lr=" + remote.lang_region;
         String zip_file_path = Gatherer.getCollectDirectoryPath() + "collections.zip";
-        action_output = remote.downloadFile(download_collection_configurations_command, zip_file_path);
-
+
+        // In the case of GS3, one of the causes the following may throw an exception is because
+        // there was no such site by the name stored in configRemote.xml under general.site_name
+        // from the previous client-gli connection session.
+        // The previous session may have connected to a different remote GS for instance,
+        // or it's a since deleted site.
+        // Need to handle this exception here if it happens the first time, else client-GLI will
+        // never open, but keep closing with the error msg that the collect directory within the
+        // unknown site does not exist, unless and until general.site_name's value is removed by
+        // hand from configRemote.xml.
+        try {
+        action_output = remote.downloadFile(download_collection_configurations_command, zip_file_path);
+        
+        } catch(Exception e) {
+        if(!Gatherer.GS3) {
+            throw(e); // rethrow, as no site in GS2
+        }
+        
+        if(e.getMessage().contains("Directory") && e.getMessage().contains("does not exist")) {
+            System.err.println("*** Warning: The stored GS3 site '" + Configuration.site_name
+                       + "' from the previous session did not exist.");
+            System.err.println("    Swapping to known site and attempting to download"
+                       + " its collection configurations.");
+            
+            // The result of cmd=get-site-names store by servlet_config before
+            // download-collection-configurations gets called.
+            ArrayList sites = Gatherer.servlet_config.getSites();
+            // Let's go with the first if there is one, else rethrow
+            if(sites.size() > 0) {
+
+            // Use a known site and one of its servlets this time.
+            String site = (String)sites.get(0);
+            String servlet = (String)Gatherer.servlet_config.getServletsForSite(site).get(0);
+            Configuration.setSiteAndServlet(site, servlet); // these values will into configRemote.xml
+
+            // Now try downloading coll configurations again, for a known site this time
+            action_output = remote.downloadFile(download_collection_configurations_command, zip_file_path);
+            
+            }
+            else {
+            throw(e);
+            }
+        } else {
+            throw(e);
+        }
+
+        }
+
+        // if we made it here, we downloaded the collection configs zip for an extant site
+        // and can continue.
         // Unzip the collection configurations just downloaded
         UnzipTools.unzipFile(zip_file_path, Gatherer.getCollectDirectoryPath());
+
     }
     }