0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#378 : fix dependencies

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-02-21 22:26:30 +09:00
parent 16cadcbb90
commit 78b207a069
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/codelibs/fess/app/service/SearchService.java
View file

@ -166,8 +166,8 @@ public class SearchService {
// search log
if (searchLogSupport) {
ComponentUtil.getSearchLogHelper().addSearchLog(request, DfTypeUtil.toLocalDateTime(requestedTime), queryId, query, pageStart,
pageSize, queryResponseList);
ComponentUtil.getSearchLogHelper().addSearchLog(DfTypeUtil.toLocalDateTime(requestedTime), queryId, query, pageStart, pageSize,
queryResponseList);
}
}

6
src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
View file

@ -51,6 +51,7 @@ import org.codelibs.fess.util.StreamUtil;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.script.Script;
import org.lastaflute.di.core.SingletonLaContainer;
import org.lastaflute.web.util.LaRequestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -75,8 +76,8 @@ public class SearchLogHelper {
userInfoCache = new LruHashMap<String, Long>(userInfoCacheSize);
}
public void addSearchLog(final HttpServletRequest request, final LocalDateTime requestedTime, final String queryId, final String query,
final int pageStart, final int pageSize, final QueryResponseList queryResponseList) {
public void addSearchLog(final LocalDateTime requestedTime, final String queryId, final String query, final int pageStart,
final int pageSize, final QueryResponseList queryResponseList) {
final RoleQueryHelper roleQueryHelper = ComponentUtil.getRoleQueryHelper();
final UserInfoHelper userInfoHelper = ComponentUtil.getUserInfoHelper();
@ -103,6 +104,7 @@ public class SearchLogHelper {
searchLog.setUser(user.getUserId());
});
final HttpServletRequest request = LaRequestUtil.getRequest();
searchLog.setClientIp(StringUtils.abbreviate(request.getRemoteAddr(), 50));
searchLog.setReferer(StringUtils.abbreviate(request.getHeader("referer"), 1000));
searchLog.setUserAgent(StringUtils.abbreviate(request.getHeader("user-agent"), 255));

2
src/main/resources/app.xml
View file

@ -16,6 +16,8 @@
<include path="crawler/client.xml" />
<include path="crawler/mimetype.xml" />
<component name="activityHelper" class="org.codelibs.fess.helper.ActivityHelper">
</component>
<component name="labelTypeHelper" class="org.codelibs.fess.helper.LabelTypeHelper">
</component>
<component name="keyMatchHelper" class="org.codelibs.fess.helper.KeyMatchHelper">

6
src/main/resources/fess.xml
View file

@ -8,8 +8,6 @@
<include path="esflute_user.xml"/>
<include path="esflute_log.xml"/>
<component name="activityHelper" class="org.codelibs.fess.helper.ActivityHelper">
</component>
<component name="searchLogHelper" class="org.codelibs.fess.helper.SearchLogHelper">
<!--
<property name="userCheckInterval">5 * 60 * 1000</property>
@ -18,8 +16,8 @@
</component>
<component name="crawlingConfigHelper" class="org.codelibs.fess.helper.CrawlingConfigHelper">
</component>
<component name="pathMappingHelper" class="org.codelibs.fess.helper.PathMappingHelper">
</component>
<component name="pathMappingHelper" class="org.codelibs.fess.helper.PathMappingHelper">
</component>
<component name="processHelper" class="org.codelibs.fess.helper.ProcessHelper">
</component>
<component name="sambaHelper" class="org.codelibs.fess.helper.SambaHelper">