Browse Source

modified Upload on suggest words

shatake 10 năm trước cách đây
mục cha
commit
f86cd807f9

+ 1 - 1
src/main/java/jp/sf/fess/action/admin/SuggestBadWordAction.java

@@ -277,7 +277,7 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
         final File oFile = tempFile;
         try {
             final String head = new String(b, Constants.UTF_8);
-            if (!head.startsWith("\"SuggestWord\",")) {
+            if (!(head.startsWith("\"BadWord\"") || head.startsWith("BadWord"))) {
                 log.error("Unknown file: "
                         + suggestBadWordForm.suggestBadWordFile);
                 throw new SSCActionMessagesException(

+ 1 - 1
src/main/java/jp/sf/fess/action/admin/SuggestElevateWordAction.java

@@ -276,7 +276,7 @@ public class SuggestElevateWordAction extends BsSuggestElevateWordAction {
         final File oFile = tempFile;
         try {
             final String head = new String(b, Constants.UTF_8);
-            if (!head.startsWith("\"SuggestWord\",")) {
+            if (!(head.startsWith("\"SuggestWord\"") || head.startsWith("SuggestWord"))) {
                 log.error("Unknown file: "
                         + suggestElevateWordForm.suggestElevateWordFile);
                 throw new SSCActionMessagesException(

+ 1 - 4
src/main/java/jp/sf/fess/service/SuggestBadWordService.java

@@ -178,16 +178,13 @@ public class SuggestBadWordService extends BsSuggestBadWordService implements
     }
 
     private static String getValue(final List<String> list, final int index) {
-        if (index < list.size()) {
-            return StringUtil.EMPTY;
-        }
         String item = list.get(index).trim();
         if (StringUtil.isBlank(item)) {
             return StringUtil.EMPTY;
         }
         if (item.length() > 1 && item.charAt(0) == '"'
                 && item.charAt(item.length() - 1) == '"') {
-            item = item.substring(1, item.length() - 2);
+            item = item.substring(1, item.length() - 1);
         }
         return item;
     }

+ 1 - 4
src/main/java/jp/sf/fess/service/SuggestElevateWordService.java

@@ -204,16 +204,13 @@ public class SuggestElevateWordService extends BsSuggestElevateWordService
     }
 
     static String getValue(final List<String> list, final int index) {
-        if (index < list.size()) {
-            return StringUtil.EMPTY;
-        }
         String item = list.get(index).trim();
         if (StringUtil.isBlank(item)) {
             return StringUtil.EMPTY;
         }
         if (item.length() > 1 && item.charAt(0) == '"'
                 && item.charAt(item.length() - 1) == '"') {
-            item = item.substring(1, item.length() - 2);
+            item = item.substring(1, item.length() - 1);
         }
         return item;
     }