Changeset 36279 for main/trunk

Timestamp:

2022-07-01T11:54:43+12:00 (22 months ago)

Author:

kjdon

Message:

when compiling the list of servlets to select in gg3 server, ignore oaiserver, mat, grabtext

File:

• main/trunk/greenstone3/src/java/org/greenstone/server/Server3Settings.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/server/Server3Settings.java

@@ -61 +61 @@
         Element url_pattern_elem = (Element) GSXML.getChildByTagName(map, "url-pattern");
         String pattern = GSXML.getNodeText(url_pattern_elem);
-        // Ignore the Axis servlets
-        if (!(name.equals("AxisServlet"))) {
-        servlet_combobox.addItem(name.trim());
-        url_mappings.put(name, pattern);
+        // Ignore the Axis servlets plus other non-library servlets
+        if (name.equals("AxisServlet") || name.equals("oaiserver") || name.equals("mat") || name.equals("grabtext") ) {
+        continue;
         }
-
+          
+        servlet_combobox.addItem(name.trim());
+        url_mappings.put(name, pattern);
+        
+        
         if (pattern.replaceAll("/\\*","").equals(servletDefault)) { // urlmapping maybe something like "/library/*", want "/library"
         servlet_combobox.setSelectedItem(name);
         }
+        
     }
-
 
         JPanel comb_panel = new JPanel();
@@ -89 +92 @@
         urlMapping = urlMapping.substring(0, urlMapping.length()-2);
     }
+    
     if (!servletDefault.equals(urlMapping)) { 
         hasChanged = true;