fixed #30945
fess/trunk/src/main/java/jp/sf/fess/helper/impl/QueryHelperImpl.java (diff) fess/trunk/src/main/java/jp/sf/fess/helper/impl/RoleQueryHelperImpl.java (diff)| @@ -145,6 +145,8 @@ | ||
| 145 | 145 | |
| 146 | 146 | protected GeoInfo defaultGeoInfo; |
| 147 | 147 | |
| 148 | + protected String defaultQueryLanguage; | |
| 149 | + | |
| 148 | 150 | /* |
| 149 | 151 | * (non-Javadoc) |
| 150 | 152 | * |
| @@ -894,6 +896,9 @@ | ||
| 894 | 896 | if (supportedLanguages.length == 0) { |
| 895 | 897 | return null; |
| 896 | 898 | } |
| 899 | + if (defaultQueryLanguage != null) { | |
| 900 | + return defaultQueryLanguage; | |
| 901 | + } | |
| 897 | 902 | final HttpServletRequest request = RequestUtil.getRequest(); |
| 898 | 903 | if (request == null) { |
| 899 | 904 | return null; |
| @@ -1391,6 +1396,17 @@ | ||
| 1391 | 1396 | this.defaultGeoInfo = defaultGeoInfo; |
| 1392 | 1397 | } |
| 1393 | 1398 | |
| 1399 | + //BEGIN: N2SEARCH | |
| 1400 | + public String getDefaultQueryLanguage() { | |
| 1401 | + return defaultQueryLanguage; | |
| 1402 | + } | |
| 1403 | + | |
| 1404 | + public void setDefaultQueryLanguage(final String defaultQueryLanguage) { | |
| 1405 | + this.defaultQueryLanguage = defaultQueryLanguage; | |
| 1406 | + } | |
| 1407 | + | |
| 1408 | + //END: N2SEARCH | |
| 1409 | + | |
| 1394 | 1410 | public static class QueryPart { |
| 1395 | 1411 | protected String value; |
| 1396 | 1412 |
| @@ -22,6 +22,7 @@ | ||
| 22 | 22 | import java.util.List; |
| 23 | 23 | |
| 24 | 24 | import javax.servlet.http.Cookie; |
| 25 | +import javax.servlet.http.HttpServletRequest; | |
| 25 | 26 | import javax.servlet.http.HttpSession; |
| 26 | 27 | |
| 27 | 28 | import jp.sf.fess.Constants; |
| @@ -90,12 +91,15 @@ | ||
| 90 | 91 | } |
| 91 | 92 | |
| 92 | 93 | // JAAS roles |
| 93 | - final HttpSession session = RequestUtil.getRequest().getSession(false); | |
| 94 | - if (session != null) { | |
| 95 | - final LoginInfo loginInfo = (LoginInfo) session | |
| 96 | - .getAttribute(Constants.LOGIN_INFO); | |
| 97 | - if (loginInfo != null) { | |
| 98 | - roleList.addAll(loginInfo.getRoleList()); | |
| 94 | + final HttpServletRequest request = RequestUtil.getRequest(); | |
| 95 | + if (request != null) { | |
| 96 | + final HttpSession session = request.getSession(false); | |
| 97 | + if (session != null) { | |
| 98 | + final LoginInfo loginInfo = (LoginInfo) session | |
| 99 | + .getAttribute(Constants.LOGIN_INFO); | |
| 100 | + if (loginInfo != null) { | |
| 101 | + roleList.addAll(loginInfo.getRoleList()); | |
| 102 | + } | |
| 99 | 103 | } |
| 100 | 104 | } |
| 101 | 105 |
| @@ -107,31 +111,39 @@ | ||
| 107 | 111 | } |
| 108 | 112 | |
| 109 | 113 | protected List<String> buildByParameter() { |
| 110 | - final String parameter = RequestUtil.getRequest().getParameter( | |
| 111 | - parameterKey); | |
| 112 | - if (StringUtil.isNotEmpty(parameter)) { | |
| 113 | - return decodedRoleList(parameter, encryptedParameterValue); | |
| 114 | - } else { | |
| 115 | - return Collections.emptyList(); | |
| 114 | + final HttpServletRequest request = RequestUtil.getRequest(); | |
| 115 | + if (request != null) { | |
| 116 | + final String parameter = request.getParameter(parameterKey); | |
| 117 | + if (StringUtil.isNotEmpty(parameter)) { | |
| 118 | + return decodedRoleList(parameter, encryptedParameterValue); | |
| 119 | + } | |
| 116 | 120 | } |
| 121 | + | |
| 122 | + return Collections.emptyList(); | |
| 117 | 123 | } |
| 118 | 124 | |
| 119 | 125 | protected List<String> buildByHeader() { |
| 120 | - final String parameter = RequestUtil.getRequest().getHeader(headerKey); | |
| 121 | - if (StringUtil.isNotEmpty(parameter)) { | |
| 122 | - return decodedRoleList(parameter, encryptedHeaderValue); | |
| 123 | - } else { | |
| 124 | - return Collections.emptyList(); | |
| 126 | + final HttpServletRequest request = RequestUtil.getRequest(); | |
| 127 | + if (request != null) { | |
| 128 | + final String parameter = request.getHeader(headerKey); | |
| 129 | + if (StringUtil.isNotEmpty(parameter)) { | |
| 130 | + return decodedRoleList(parameter, encryptedHeaderValue); | |
| 131 | + } | |
| 125 | 132 | } |
| 133 | + return Collections.emptyList(); | |
| 134 | + | |
| 126 | 135 | } |
| 127 | 136 | |
| 128 | 137 | protected List<String> buildByCookie() { |
| 129 | - final Cookie[] cookies = RequestUtil.getRequest().getCookies(); | |
| 130 | - for (final Cookie cookie : cookies) { | |
| 131 | - if (cookieKey.equals(cookie.getName())) { | |
| 132 | - final String value = cookie.getValue(); | |
| 133 | - if (StringUtil.isNotEmpty(value)) { | |
| 134 | - return decodedRoleList(value, encryptedCookieValue); | |
| 138 | + final HttpServletRequest request = RequestUtil.getRequest(); | |
| 139 | + if (request != null) { | |
| 140 | + final Cookie[] cookies = request.getCookies(); | |
| 141 | + for (final Cookie cookie : cookies) { | |
| 142 | + if (cookieKey.equals(cookie.getName())) { | |
| 143 | + final String value = cookie.getValue(); | |
| 144 | + if (StringUtil.isNotEmpty(value)) { | |
| 145 | + return decodedRoleList(value, encryptedCookieValue); | |
| 146 | + } | |
| 135 | 147 | } |
| 136 | 148 | } |
| 137 | 149 | } |