Changeset 14323 for gli

Timestamp:

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

Author:

qq6

Message:

set download web.xml first

File:

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

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

@@ -68 +68 @@
     
     this.gsdl3_path = gsdl3_path;
-    
+
+    if (Gatherer.isGsdlRemote){
+        if (RemoteGreenstoneServer.downloadWebXMLFile().equals("")) {
+        System.err.println("Error: Could not download web.xml.");
+        System.exit(0);
+        }
+    }
     //String web_xml_path = gsdl3_path + File.separator + "web" + File.separator + "WEB-INF"+ File.separator + "web.xml";
     File web_xml;
@@ -83 +89 @@
     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("")) {
@@ -101 +103 @@
         }
     }else{
-    // find the sites
-    File start = new File(Utility.getSitesDir(gsdl3_path));
-    File possible_sites[] = start.listFiles();
-    ArrayTools.sort(possible_sites);
-    for (int i=0; possible_sites != null && i < possible_sites.length; i++) {
-        File site_config = new File(possible_sites[i], "siteConfig.xml");
-        if (site_config.exists()) {
-        this.sites.add(possible_sites[i].getName());
+        // find the sites
+        File start = new File(Utility.getSitesDir(gsdl3_path));
+        File possible_sites[] = start.listFiles();
+        ArrayTools.sort(possible_sites);
+        for (int i=0; possible_sites != null && i < possible_sites.length; i++) {
+        File site_config = new File(possible_sites[i], "siteConfig.xml");
+        if (site_config.exists()) {
+            this.sites.add(possible_sites[i].getName());
+        }
         }
     }
-    }
+
     this.mappings = new HashMap();
     Document web_config = XMLTools.parseXMLFile(web_xml.getAbsolutePath(), false);