diff --git a/src/main/java/jp/sf/fess/helper/WebFsIndexHelper.java b/src/main/java/jp/sf/fess/helper/WebFsIndexHelper.java index 27df995c2..30f3fcb71 100644 --- a/src/main/java/jp/sf/fess/helper/WebFsIndexHelper.java +++ b/src/main/java/jp/sf/fess/helper/WebFsIndexHelper.java @@ -100,10 +100,22 @@ public class WebFsIndexHelper implements Serializable { public void crawl(final String sessionId, final List webConfigIdList, final List fileConfigIdList, final SolrGroup solrGroup) { - final List webConfigList = webCrawlingConfigService - .getWebCrawlingConfigListByIds(webConfigIdList); - final List fileConfigList = fileCrawlingConfigService - .getFileCrawlingConfigListByIds(fileConfigIdList); + final boolean runAll = webConfigIdList == null + && fileConfigIdList == null; + final List webConfigList; + if (runAll || webConfigIdList != null) { + webConfigList = webCrawlingConfigService + .getWebCrawlingConfigListByIds(webConfigIdList); + } else { + webConfigList = Collections.emptyList(); + } + final List fileConfigList; + if (runAll || fileConfigIdList != null) { + fileConfigList = fileCrawlingConfigService + .getFileCrawlingConfigListByIds(fileConfigIdList); + } else { + fileConfigList = Collections.emptyList(); + } if (webConfigList.isEmpty() && fileConfigList.isEmpty()) { // nothing diff --git a/src/main/java/jp/sf/fess/job/CrawlJob.java b/src/main/java/jp/sf/fess/job/CrawlJob.java index 6edcf301c..19ac1d800 100644 --- a/src/main/java/jp/sf/fess/job/CrawlJob.java +++ b/src/main/java/jp/sf/fess/job/CrawlJob.java @@ -52,11 +52,17 @@ public class CrawlJob { final String[] fileConfigIds, final String[] dataConfigIds, final String operation) { final StringBuilder resultBuf = new StringBuilder(); + final boolean runAll = webConfigIds == null && fileConfigIds == null + && dataConfigIds == null; resultBuf.append("Session Id: ").append(sessionId).append("\n"); resultBuf.append("Web Config Id:"); if (webConfigIds == null) { - resultBuf.append(" ALL\n"); + if (runAll) { + resultBuf.append(" ALL\n"); + } else { + resultBuf.append(" NONE\n"); + } } else { for (final String id : webConfigIds) { resultBuf.append(' ').append(id); @@ -65,7 +71,11 @@ public class CrawlJob { } resultBuf.append("File Config Id:"); if (fileConfigIds == null) { - resultBuf.append(" ALL\n"); + if (runAll) { + resultBuf.append(" ALL\n"); + } else { + resultBuf.append(" NONE\n"); + } } else { for (final String id : fileConfigIds) { resultBuf.append(' ').append(id); @@ -74,7 +84,11 @@ public class CrawlJob { } resultBuf.append("Data Config Id:"); if (dataConfigIds == null) { - resultBuf.append(" ALL\n"); + if (runAll) { + resultBuf.append(" ALL\n"); + } else { + resultBuf.append(" NONE\n"); + } } else { for (final String id : dataConfigIds) { resultBuf.append(' ').append(id);