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

fix #890 remove operation

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-02-09 16:29:28 +09:00
parent 02edb397a5
commit 84fbd3e334
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/org/codelibs/fess/job/CrawlJob.java
View file

@ -62,8 +62,6 @@ public class CrawlJob {
protected String[] dataConfigIds;
protected String operation;
protected String logFilePath;
protected String logLevel;
@ -91,11 +89,6 @@ public class CrawlJob {
return this;
}
public CrawlJob operation(final String operation) {
this.operation = operation;
return this;
}
public CrawlJob logFilePath(final String logFilePath) {
this.logFilePath = logFilePath;
return this;
@ -145,15 +138,16 @@ public class CrawlJob {
return this;
}
@Deprecated
public String execute(final JobExecutor jobExecutor) {
jobExecutor(jobExecutor);
return execute();
}
@Deprecated
public String execute(final JobExecutor jobExecutor, final String[] webConfigIds, final String[] fileConfigIds,
final String[] dataConfigIds, final String operation) {
jobExecutor(jobExecutor);
operation(operation);
webConfigIds(webConfigIds);
fileConfigIds(fileConfigIds);
dataConfigIds(dataConfigIds);
@ -161,10 +155,10 @@ public class CrawlJob {
}
@Deprecated
public String execute(final JobExecutor jobExecutor, final String sessionId, final String[] webConfigIds, final String[] fileConfigIds,
final String[] dataConfigIds, final String operation) {
jobExecutor(jobExecutor);
operation(operation);
webConfigIds(webConfigIds);
fileConfigIds(fileConfigIds);
dataConfigIds(dataConfigIds);
@ -356,10 +350,6 @@ public class CrawlJob {
cmdList.add("-d");
cmdList.add(StringUtils.join(dataConfigIds, ','));
}
if (StringUtil.isNotBlank(operation)) {
cmdList.add("-o");
cmdList.add(operation);
}
if (documentExpires >= -1) {
cmdList.add("-e");
cmdList.add(Integer.toString(documentExpires));

4
src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
View file

@ -97,7 +97,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. Data Crawler - {0} */
String JOB_TEMPLATE_TITLE_DATA = "job.template.title.data";
/** The key of the configuration. e.g. return container.getComponent("crawlJob").logLevel("info").sessionId("{3}").execute(executor, [{0}] as String[],[{1}] as String[],[{2}] as String[], ""); */
/** The key of the configuration. e.g. return container.getComponent("crawlJob").logLevel("info").sessionId("{3}").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute(); */
String JOB_TEMPLATE_SCRIPT = "job.template.script";
/** The key of the configuration. e.g. java */
@ -1287,7 +1287,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'job.template.script'. <br>
* The value is, e.g. return container.getComponent("crawlJob").logLevel("info").sessionId("{3}").execute(executor, [{0}] as String[],[{1}] as String[],[{2}] as String[], ""); <br>
* The value is, e.g. return container.getComponent("crawlJob").logLevel("info").sessionId("{3}").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute(); <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getJobTemplateScript();

2
src/main/resources/fess_config.properties
View file

@ -65,7 +65,7 @@ job.system.job.ids=default_crawler
job.template.title.web=Web Crawler - {0}
job.template.title.file=File Crawler - {0}
job.template.title.data=Data Crawler - {0}
job.template.script=return container.getComponent("crawlJob").logLevel("info").sessionId("{3}").execute(executor, [{0}] as String[],[{1}] as String[],[{2}] as String[], "");
job.template.script=return container.getComponent("crawlJob").logLevel("info").sessionId("{3}").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute();
java.command.path=java
path.encoding=UTF-8