Changeset 14310 for gli

Timestamp:

2007-08-06T11:36:26+12:00 (17 years ago)

Author:

qq6

Message:

download web.xml and get names of sites if Gatherer.isGsdlRemote

File:

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

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

@@ -44 +44 @@
 import javax.swing.*;
 import javax.swing.plaf.*;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.util.ArrayTools;
@@ -49 +50 @@
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XMLTools;
+import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.w3c.dom.*;
 
@@ -68 +70 @@
     
     //String web_xml_path = gsdl3_path + File.separator + "web" + File.separator + "WEB-INF"+ File.separator + "web.xml";
-    File web_xml = new File(gsdl3_path + "WEB-INF"+ File.separator + "web.xml");
-
+    File web_xml;
+    if (Gatherer.isGsdlRemote){
+        web_xml = new File(gsdl3_path + "web.xml");
+    }else{
+        web_xml = new File(gsdl3_path + "WEB-INF"+ File.separator + "web.xml");
+    }
     if (!web_xml.exists()) {
         DebugStream.println("Error: no web.xml found at "+web_xml.toString());
@@ -76 +82 @@
 
     this.sites = new ArrayList();
+    if (Gatherer.isGsdlRemote){
+        if (RemoteGreenstoneServer.downloadWebXMLFile().equals("")) {
+        System.err.println("Error: Could not download web.xml.");
+        System.exit(0);
+        }
+        String sites_on_server = RemoteGreenstoneServer.getSiteNames();
+        if (sites_on_server.equals("")) {
+        // !! Something went wrong : could not get names of the sites
+        System.err.println("Error: Could not get names of the sites.");
+        System.exit(0);
+        }
+       
+        String[] sites_arr=sites_on_server.split("-----");
+        for (int i=0; i<sites_arr.length; i++){
+        if (!(sites_arr[i].trim().equals(""))){
+            this.sites.add(sites_arr[i].trim());
+        }
+        }
+    }else{
     // find the sites
     File start = new File(Utility.getSitesDir(gsdl3_path));
@@ -86 +111 @@
         }
     }
-    
+    }
     this.mappings = new HashMap();
     Document web_config = XMLTools.parseXMLFile(web_xml.getAbsolutePath(), false);