Changeset 14538

Timestamp:

2007-09-18T15:10:08+12:00 (16 years ago)

Author:

qq6

Message:

if the server couldn't be connected in 10 seconds, a warning message is displayed and suggesting the user to terminate the current connecting

File:

• gli/trunk/src/org/greenstone/gatherer/greenstone3/ServletConfiguration.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/greenstone3/ServletConfiguration.java

@@ -40 +40 @@
 import java.io.*;
 import java.lang.ref.*;
+import java.lang.Thread;
 import java.net.*;
 import java.util.*;
@@ -65 +66 @@
     private HashMap mappings = null;
 
-    public ServletConfiguration(String gsdl3_path) {
+    public ServletConfiguration(String gsdl3_path) throws InterruptedException {
     
     this.gsdl3_path = gsdl3_path;
 
     if (Gatherer.isGsdlRemote){
-        if (RemoteGreenstoneServer.downloadWebXMLFile().equals("")) {
-        System.err.println("Error: Could not download web.xml.");
-        System.exit(0);
-        }
-    }
+        // if (RemoteGreenstoneServer.downloadWebXMLFile().equals("")) {
+        //System.err.println("Error: Could not download web.xml.");
+        //System.exit(0);
+        //}
+        System.out.println("Starting download web.xml.");
+        long startTime = System.currentTimeMillis();
+        long patience = 1000 * 10;
+        Thread t = new Thread(new downloadWebXMl());
+        t.start();
+
+        System.out.println("Waiting for download thread to finish");
+        while (t.isAlive()) {
+        System.out.println("Still waiting...");
+        //Wait maximum of 1 second for MessageLoop thread to
+            //finish.
+        t.join(1000);
+        if (((System.currentTimeMillis() - startTime) > patience) &&
+                    t.isAlive()) {
+            //t.interrupt();
+            //Shouldn't be long now -- wait indefinitely
+            //t.join();
+            System.out.print("Have been waiting 10 seconds for connecting to the server, do you want to terminate the connection?(y/n)");
+            BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+            try {
+            if (br.readLine().toLowerCase().startsWith("y")){
+                 System.out.println("Terminate the connection! ");
+                 System.exit(0);
+            }else{
+                startTime = System.currentTimeMillis();
+            };
+            } catch (IOException ioe) {
+            System.out.println("IO error trying to read your answer!");
+            System.exit(1);
+            }
+        }
+        }
+        System.out.println("The web.xml file has been downloaded");
+    }
+    
     //String web_xml_path = gsdl3_path + File.separator + "web" + File.separator + "WEB-INF"+ File.separator + "web.xml";
     File web_xml;
@@ -184 +219 @@
     return site;
     }
+
+    private static class downloadWebXMl implements Runnable {
+    public void run() {
+        if (RemoteGreenstoneServer.downloadWebXMLFile().equals("")) {
+        System.err.println("Error: Could not download web.xml.");
+        System.exit(0);
+        }
+    }
+    }
+
 }