Changeset 25388

Timestamp:

2012-04-16T20:50:16+12:00 (12 years ago)

Author:

ak19

Message:

Correcting the behaviour of Server3 window's servlet combobox: it should have the current servlet selected and also deal with URL mappings that end with forwardslash-star.

File:

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

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

@@ -33 +33 @@
     JLabel servlet_label = new JLabel(server.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".URL"));
 
-    this.servletDefault = server.config_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET).replaceAll("/","");
-    
+    this.servletDefault = server.config_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET);
+
     servlet_combobox = new JComboBox();
     servlet_combobox.setMaximumRowCount(5);
@@ -62 +62 @@
         }
 
-        if (pattern.replaceAll("/","").equals(servletDefault)) {
+        if (pattern.replaceAll("/\\*","").equals(servletDefault)) { // urlmapping maybe something like "/library/*", want "/library"
         servlet_combobox.setSelectedItem(name);
         }
@@ -80 +80 @@
     boolean hasChanged = false;
     boolean requireRestart = false;
-    if (!servletDefault.equals((String)url_mappings.get(servlet_combobox.getSelectedItem()))) {
+    String urlMapping = (String)url_mappings.get(servlet_combobox.getSelectedItem());
+    if(urlMapping.endsWith("/*")) { // urlmapping maybe something like "/library/*"
+        urlMapping = urlMapping.substring(0, urlMapping.length()-2);
+    }
+    if (!servletDefault.equals(urlMapping)) { 
         hasChanged = true;
         requireRestart = true;
@@ -97 +101 @@
 
     String newServletDef = (String) servlet_combobox.getSelectedItem();
-    newFileLines = scriptReadWrite.queryReplace(newFileLines,BaseServer.Property.DEFAULT_SERVLET, (String) url_mappings.get(newServletDef));    
+    String servletDefName = (String) url_mappings.get(newServletDef);
+    if(servletDefName.endsWith("/*")) { // urlmapping maybe something like "/library/*"     
+      servletDefName = servletDefName.substring(0, servletDefName.length()-2);
+    }
+    newFileLines = scriptReadWrite.queryReplace(newFileLines,BaseServer.Property.DEFAULT_SERVLET, servletDefName);
     }