Changeset 36103

Timestamp:

2022-03-11T10:07:12+13:00 (2 years ago)

Author:

kjdon

Message:

added second hashmap so we can get site name for a servlet path

File:

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

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

@@ -63 +63 @@
     private String gsdl3_path = "";
     private ArrayList sites = null;
-    private HashMap mappings = null;
+    private HashMap site_to_servlet_list_map = null;
+    private HashMap servlet_to_site_map = null;
 
     public ServletConfiguration(String gsdl3_path) {
@@ -71 +72 @@
     if (Gatherer.isGsdlRemote){
         if (Gatherer.remoteGreenstoneServer.downloadWebXMLFile().equals("")) {
-        System.err.println("Error: Could not download web.xml.");
+        System.err.println("ServletConfiguration Error: Could not download web.xml.");
         System.exit(0);
         }
@@ -92 +93 @@
         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.err.println("ServletConfiguration Error: Could not get names of the sites.");
         System.exit(0);
         }
@@ -115 +116 @@
     }
 
-    this.mappings = new HashMap();
+    this.site_to_servlet_list_map = new HashMap();
+    this.servlet_to_site_map = new HashMap();
     Document web_config = XMLTools.parseXMLFile(web_xml.getAbsolutePath(), false);
        
@@ -137 +139 @@
            
         if (site != null) {
-        ArrayList this_site = (ArrayList)mappings.get(site);
+        ArrayList this_site = (ArrayList)site_to_servlet_list_map.get(site);
         if (this_site == null) {
             this_site = new ArrayList();
@@ -146 +148 @@
         }
         this_site.add(url);
-        mappings.put(site, this_site);
+        this.site_to_servlet_list_map.put(site, this_site);
+        this.servlet_to_site_map.put(url, site);
         }
         
@@ -160 +163 @@
 
     public ArrayList getServletsForSite(String site) {
-    return (ArrayList)this.mappings.get(site);
+    return (ArrayList)this.site_to_servlet_list_map.get(site);
     }
     public String getServletPath(String site) {
     
     // for now, get the first one
-    ArrayList servlets = (ArrayList)mappings.get(site);
+    ArrayList servlets = (ArrayList)this.site_to_servlet_list_map.get(site);
     if(servlets == null) {
         return null;
     }
     return (String)servlets.get(0);
+    }
+
+    public String getSiteForServlet(String servlet) {
+    return (String)this.servlet_to_site_map.get(servlet);
     }