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

fix #2376 replace with _

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-02-01 06:45:33 +09:00
parent 59cc8f663a
commit c29d112b76
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
View file

@ -140,14 +140,15 @@ public class AdminSchedulerAction extends FessAdminAction {
final String decodedName = new String(Base64.getUrlDecoder().decode(name), Constants.CHARSET_UTF_8);
scheduledJobForm.name = MessageFormat.format(fessConfig.getJobTemplateTitle(type), decodedName);
final String[] ids = new String[] { "", "", "" };
final String configId = id.replace('-', '_');
if (Constants.WEB_CRAWLER_TYPE.equals(type)) {
ids[0] = "\"" + id + "\"";
ids[0] = "\"" + configId + "\"";
} else if (Constants.FILE_CRAWLER_TYPE.equals(type)) {
ids[1] = "\"" + id + "\"";
ids[1] = "\"" + configId + "\"";
} else if (Constants.DATA_CRAWLER_TYPE.equals(type)) {
ids[2] = "\"" + id + "\"";
ids[2] = "\"" + configId + "\"";
}
scheduledJobForm.scriptData = MessageFormat.format(fessConfig.getJobTemplateScript(), ids[0], ids[1], ids[2], id);
scheduledJobForm.scriptData = MessageFormat.format(fessConfig.getJobTemplateScript(), ids[0], ids[1], ids[2], configId);
});
});
}

2
src/main/java/org/codelibs/fess/exec/Crawler.java
View file

@ -307,6 +307,8 @@ public class Crawler {
// use a default session id
final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
options.sessionId = sdf.format(new Date());
} else {
options.sessionId = options.sessionId.replace('-', '_');
}
final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper();