Changeset 14309 for gli/trunk

Timestamp:

2007-08-06T11:24:46+12:00 (17 years ago)

Author:

qq6

Message:

added the site info for a remote GS3

File:

• gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java (modified) (9 diffs)

gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java

@@ -35 +35 @@
 import javax.swing.event.*;
 import javax.swing.plaf.*;
+import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.GAuthenticator;
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
@@ -201 +203 @@
     JPanel gliserver_url_pane = null;
     JLabel gliserver_url_label = null;
-    if (Gatherer.isGsdlRemote) {
+    if (Gatherer.isGsdlRemote && !Gatherer.GS3) {
         gliserver_url_pane = new JPanel();
         gliserver_url_pane.setPreferredSize(ROW_SIZE);
@@ -322 +324 @@
     library_path_pane.add(library_path_field, BorderLayout.CENTER);
 
-    if (Gatherer.isGsdlRemote) {
+    if (Gatherer.isGsdlRemote && !Gatherer.GS3) {
         gliserver_url_pane.setLayout(new BorderLayout());
         gliserver_url_pane.add(gliserver_url_label, BorderLayout.WEST);
@@ -350 +352 @@
     connection_pane.add(program_pane);
     connection_pane.add(library_path_pane);
-    if (Gatherer.isGsdlRemote) {
+    if (Gatherer.isGsdlRemote && !Gatherer.GS3) {
         connection_pane.add(gliserver_url_pane);
     }
@@ -669 +671 @@
         Configuration.setString("general.library_url", true, library_url_string);
 
-        if (Gatherer.isGsdlRemote) {
+        if (Gatherer.isGsdlRemote && !Gatherer.GS3) {
         String gliserver_url_string = gliserver_url_field.getText();
         if (gliserver_url_string.equals("")) {
@@ -760 +762 @@
         }
 
-        if (Gatherer.GS3 && site_changed && Gatherer.c_man.getCollection() != null) {
+        if (Gatherer.GS3 && site_changed && Gatherer.c_man.getCollection() != null && !Gatherer.isGsdlRemote) {
         // shut down the collection
         System.err.println("shutting down teh collection");
@@ -783 +785 @@
         // Always save configuration changes immediately (in case the GLI crashes)
         Configuration.save();
-
+        if (Gatherer.isGsdlRemote && Gatherer.GS3 && site_changed ){
+        RemoteGreenstoneServer.downloadCollectionConfigurations();
+        }
         // Refresh the GLI to account for the configuration changes
         Gatherer.refresh(Gatherer.PREFERENCES_CHANGED);
@@ -894 +898 @@
         current_site_selection = site;
         System.err.println("changed the current selection");
+        
         ArrayList servlet_options = Gatherer.servlet_config.getServletsForSite(current_site_selection);
         if (servlet_options == null) {
@@ -906 +911 @@
             servlet_combobox.setToolTipText(Dictionary.get("Preferences.Connection.Servlet_Tooltip"));
             servlet_combobox.setEnabled(true);
+        }
+        if (Gatherer.isGsdlRemote){
+            // Close the current collection, remove the lock on this file, ask to login to the new site, then download collection configurations of the site.
+            if (Gatherer.c_man.getCollection()!=null){
+            Gatherer.g_man.closeCurrentCollection();
+            }
+            File lock_file = new File(Gatherer.c_man.getLoadedCollectionDirectoryPath() + "gli.lck");
+            RemoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
+            Configuration.site_name=site;
+            RemoteGreenstoneServer.set_remote_greenstone_server_authentication_to_null();
+            RemoteGreenstoneServer.downloadCollectionConfigurations();
         }
         }