Ver código fonte

fix #1624 change access type to gsa

Shinsuke Sugaya 7 anos atrás
pai
commit
a29b40f03d

+ 1 - 1
src/main/java/org/codelibs/fess/Constants.java

@@ -249,7 +249,7 @@ public class Constants extends CoreLibConstants {
 
     public static final String SEARCH_LOG_ACCESS_TYPE_JSON = "json";
 
-    public static final String SEARCH_LOG_ACCESS_TYPE_XML = "xml";
+    public static final String SEARCH_LOG_ACCESS_TYPE_GSA = "gsa";
 
     public static final String SEARCH_LOG_ACCESS_TYPE_WEB = "web";
 

+ 1 - 1
src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java

@@ -107,7 +107,7 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager {
         String errMsg = StringUtil.EMPTY;
         String query = null;
         final StringBuilder buf = new StringBuilder(1000);
-        request.setAttribute(Constants.SEARCH_LOG_ACCESS_TYPE, Constants.SEARCH_LOG_ACCESS_TYPE_XML);
+        request.setAttribute(Constants.SEARCH_LOG_ACCESS_TYPE, Constants.SEARCH_LOG_ACCESS_TYPE_GSA);
         boolean xmlDtd = false;
         try {
             final SearchRenderData data = new SearchRenderData();

+ 1 - 1
src/main/java/org/codelibs/fess/helper/QueryHelper.java

@@ -752,7 +752,7 @@ public class QueryHelper {
                 if (StringUtil.isNotBlank(pref)) {
                     return pref;
                 }
-            } else if (Constants.SEARCH_LOG_ACCESS_TYPE_XML.equals(accessType)) {
+            } else if (Constants.SEARCH_LOG_ACCESS_TYPE_GSA.equals(accessType)) {
                 final String pref = fessConfig.getQueryGsaDefaultPreference();
                 if (StringUtil.isNotBlank(pref)) {
                     return pref;

+ 2 - 2
src/main/java/org/codelibs/fess/helper/SearchLogHelper.java

@@ -107,8 +107,8 @@ public class SearchLogHelper {
         final Object accessType = request.getAttribute(Constants.SEARCH_LOG_ACCESS_TYPE);
         if (Constants.SEARCH_LOG_ACCESS_TYPE_JSON.equals(accessType)) {
             searchLog.setAccessType(Constants.SEARCH_LOG_ACCESS_TYPE_JSON);
-        } else if (Constants.SEARCH_LOG_ACCESS_TYPE_XML.equals(accessType)) {
-            searchLog.setAccessType(Constants.SEARCH_LOG_ACCESS_TYPE_XML);
+        } else if (Constants.SEARCH_LOG_ACCESS_TYPE_GSA.equals(accessType)) {
+            searchLog.setAccessType(Constants.SEARCH_LOG_ACCESS_TYPE_GSA);
         } else if (Constants.SEARCH_LOG_ACCESS_TYPE_OTHER.equals(accessType)) {
             searchLog.setAccessType(Constants.SEARCH_LOG_ACCESS_TYPE_OTHER);
         } else {