提交 24dc0008 编写于 作者: L lvotypko

Optional case-sensitivity for search tool. Default setting is case-sensitive,...

Optional case-sensitivity for search tool. Default setting is case-sensitive, loged users can change it to case-insensitive in their configuration page.
上级 c7005be6
......@@ -26,6 +26,7 @@ package hudson.search;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import hudson.model.User;
/**
* {@link SearchIndex} built on a {@link Map}.
......@@ -51,10 +52,19 @@ public abstract class CollectionSearchIndex<SMT extends SearchableModelObject> i
}
public void suggest(String token, List<SearchItem> result) {
Collection<SMT> items = all();
Collection<SMT> items = all();
User user = User.current();
boolean caseSensitive = false;
if(user!=null && user.getProperty(Search.UserProperty.class).getInsensitiveSearch()){ //Searching for anonymous user is case-sensitive
token = token.toLowerCase();
caseSensitive=true;
}
if(items==null) return;
for (SMT o : items) {
if(o!=null && getName(o).toLowerCase().contains(token.toLowerCase()))
String name = getName(o);
if(caseSensitive)
name=name.toLowerCase();
if(o!=null && name.contains(token))
result.add(o);
}
}
......
......@@ -23,6 +23,7 @@
*/
package hudson.search;
import hudson.model.User;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
......@@ -44,14 +45,37 @@ public class FixedSet implements SearchIndex {
}
public void find(String token, List<SearchItem> result) {
for (SearchItem i : items)
if(token.toLowerCase().equals(i.getSearchName().toLowerCase()))
boolean caseSensitive = getCaseSensitivity();
for (SearchItem i : items){
String name = i.getSearchName();
if(caseSensitive){
token=token.toLowerCase();
name=name.toLowerCase();
}
if(token.equals(i.getSearchName()))
result.add(i);
}
}
public boolean getCaseSensitivity(){
User user = User.current();
boolean caseSensitive = false;
if(user!=null && user.getProperty(Search.UserProperty.class).getInsensitiveSearch()){//Searching for anonymous user is case-sensitive
caseSensitive=true;
}
return caseSensitive;
}
public void suggest(String token, List<SearchItem> result) {
for (SearchItem i : items)
if(i.getSearchName().toLowerCase().contains(token.toLowerCase()))
boolean caseSensitive = getCaseSensitivity();
for (SearchItem i : items){
String name = i.getSearchName();
if(caseSensitive){
token=token.toLowerCase();
name=name.toLowerCase();
}
if(name.contains(token))
result.add(i);
}
}
}
......@@ -24,9 +24,12 @@
*/
package hudson.search;
import hudson.Extension;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import hudson.Util;
import hudson.model.User;
import hudson.model.UserPropertyDescriptor;
import hudson.util.EditDistance;
import java.io.IOException;
import java.util.AbstractList;
......@@ -39,6 +42,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.ServletException;
import net.sf.json.JSONObject;
import org.kohsuke.stapler.Ancestor;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
......@@ -349,4 +353,35 @@ public class Search {
}
private final static Logger LOGGER = Logger.getLogger(Search.class.getName());
//User`s setting of case-sensitivity for searching
public static class UserProperty extends hudson.model.UserProperty {
private final boolean insensitiveSearch;
public UserProperty(boolean insensitiveSearch) {
this.insensitiveSearch = insensitiveSearch;
}
@Exported
public boolean getInsensitiveSearch() {
return insensitiveSearch;
}
@Extension
public static final class DescriptorImpl extends UserPropertyDescriptor {
public String getDisplayName() {
return "Setting for search";
}
public UserProperty newInstance(User user) {
return new UserProperty(false); //default setting is case-sensitive searching
}
@Override
public UserProperty newInstance(StaplerRequest req, JSONObject formData) throws FormException {
return new UserProperty(formData.optBoolean("insensitiveSearch"));
}
}
}
}
<!--
The MIT License
Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Daniel Dyer
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:entry title="Case-sensitivity">
<f:checkbox name="insensitiveSearch" checked="${instance.insensitiveSearch}" title="Insensitive search tool"/>
</f:entry>
</j:jelly>
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册