fix #2328 add storage protocol

This commit is contained in:
Shinsuke Sugaya 2019-12-12 17:34:20 +09:00
parent 3d904202d8
commit 40d2e9c284
5 changed files with 8 additions and 7 deletions

View file

@ -253,7 +253,7 @@ public class AdminWizardAction extends FessAdminAction {
protected String convertCrawlingPath(final String path) {
if (path.startsWith("http:") || path.startsWith("https:") || path.startsWith("smb:") || path.startsWith("smb1:")
|| path.startsWith("ftp:")) {
|| path.startsWith("ftp:") || path.startsWith("storage:")) {
return path;
}

View file

@ -153,6 +153,7 @@ public class GoAction extends FessSearchAction {
}
protected boolean isFileSystemPath(final String url) {
return url.startsWith("file:") || url.startsWith("smb:") || url.startsWith("smb1:") || url.startsWith("ftp:");
return url.startsWith("file:") || url.startsWith("smb:") || url.startsWith("smb1:") || url.startsWith("ftp:")
|| url.startsWith("storage:");
}
}

View file

@ -298,7 +298,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. http,https */
String CRAWLER_WEB_PROTOCOLS = "crawler.web.protocols";
/** The key of the configuration. e.g. file,smb,smb1,ftp */
/** The key of the configuration. e.g. file,smb,smb1,ftp,storage */
String CRAWLER_FILE_PROTOCOLS = "crawler.file.protocols";
/** The key of the configuration. e.g. false */
@ -2291,7 +2291,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'crawler.file.protocols'. <br>
* The value is, e.g. file,smb,smb1,ftp <br>
* The value is, e.g. file,smb,smb1,ftp,storage <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getCrawlerFileProtocols();
@ -8982,7 +8982,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.CRAWLER_DOCUMENT_FULLSTOP_CHARS, "u002eu06d4u2e3cu3002");
defaultMap.put(FessConfig.CRAWLER_CRAWLING_DATA_ENCODING, "UTF-8");
defaultMap.put(FessConfig.CRAWLER_WEB_PROTOCOLS, "http,https");
defaultMap.put(FessConfig.CRAWLER_FILE_PROTOCOLS, "file,smb,smb1,ftp");
defaultMap.put(FessConfig.CRAWLER_FILE_PROTOCOLS, "file,smb,smb1,ftp,storage");
defaultMap.put(FessConfig.CRAWLER_IGNORE_ROBOTS_TXT, "false");
defaultMap.put(FessConfig.CRAWLER_IGNORE_ROBOTS_TAGS, "false");
defaultMap.put(FessConfig.CRAWLER_IGNORE_CONTENT_EXCEPTION, "true");

View file

@ -70,7 +70,7 @@ public class GsaConfigParser extends DefaultHandler {
protected String[] webProtocols = new String[] { "http:", "https:" };
protected String[] fileProtocols = new String[] { "file:", "smb:", "smb1:", "ftp:" };
protected String[] fileProtocols = new String[] { "file:", "smb:", "smb1:", "ftp:", "storage:" };
protected LinkedList<String> tagQueue;

View file

@ -194,7 +194,7 @@ crawler.document.space.chars=u0009u000Au000Bu000Cu000Du001Cu001Du001Eu001Fu0020u
crawler.document.fullstop.chars=u002eu06d4u2e3cu3002
crawler.crawling.data.encoding=UTF-8
crawler.web.protocols=http,https
crawler.file.protocols=file,smb,smb1,ftp
crawler.file.protocols=file,smb,smb1,ftp,storage
crawler.ignore.robots.txt=false
crawler.ignore.robots.tags=false
crawler.ignore.content.exception=true