Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-24 11:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

SOLR-7546: bin/post (and SimplePostTool in -Dauto=yes mode) now sends rather than skips files without a known content type, as application/octet-stream, provided it still is in the allowed filetypes setting

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1680047 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Erik Hatcher 2015-05-18 15:51:44 +00:00
parent 9e4a25adf7
commit 64274166b8
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -195,6 +195,9 @@ New Features
Example: json.facet={ numProducts : "hll(product_id)" } Example: json.facet={ numProducts : "hll(product_id)" }
(yonik) (yonik)
* SOLR-7546: bin/post (and SimplePostTool in -Dauto=yes mode) now sends rather than skips files
without a known content type, as "application/octet-stream", provided it still is in the
allowed filetypes setting. (ehatcher)
Bug Fixes Bug Fixes
---------------------- ----------------------

33
solr/core/src/java/org/apache/solr/util/SimplePostTool.java
View File

@ -360,8 +360,6 @@ public class SimplePostTool {
} }
private void reset() { private void reset() {
fileTypes = DEFAULT_FILE_TYPES;
globFileFilter = this.getFileFilterFromFileTypes(fileTypes);
backlog = new ArrayList<>(); backlog = new ArrayList<>();
visited = new HashSet<>(); visited = new HashSet<>();
} }
@ -774,22 +772,19 @@ public class SimplePostTool {
if(type == null) { if(type == null) {
type = guessType(file); type = guessType(file);
} }
if(type != null) { // TODO: Add a flag that disables /update and sends all to /update/extract, to avoid CSV, JSON, and XML files
if(type.equals("application/xml") || type.equals("text/csv") || type.equals("application/json")) { // TODO: from being interpreted as Solr documents internally
// Default handler if(type.equals("application/xml") || type.equals("text/csv") || type.equals("application/json")) {
} else { // Default handler
// SolrCell
suffix = "/extract";
String urlStr = appendUrlPath(solrUrl, suffix).toString();
if(urlStr.indexOf("resource.name")==-1)
urlStr = appendParam(urlStr, "resource.name=" + URLEncoder.encode(file.getAbsolutePath(), "UTF-8"));
if(urlStr.indexOf("literal.id")==-1)
urlStr = appendParam(urlStr, "literal.id=" + URLEncoder.encode(file.getAbsolutePath(), "UTF-8"));
url = new URL(urlStr);
}
} else { } else {
warn("Skipping "+file.getName()+". Unsupported file type for auto mode."); // SolrCell
return; suffix = "/extract";
String urlStr = appendUrlPath(solrUrl, suffix).toString();
if(urlStr.indexOf("resource.name")==-1)
urlStr = appendParam(urlStr, "resource.name=" + URLEncoder.encode(file.getAbsolutePath(), "UTF-8"));
if(urlStr.indexOf("literal.id")==-1)
urlStr = appendParam(urlStr, "literal.id=" + URLEncoder.encode(file.getAbsolutePath(), "UTF-8"));
url = new URL(urlStr);
} }
} else { } else {
if(type == null) type = DEFAULT_CONTENT_TYPE; if(type == null) type = DEFAULT_CONTENT_TYPE;
@ -821,13 +816,15 @@ public class SimplePostTool {
/** /**
* Guesses the type of a file, based on file name suffix * Guesses the type of a file, based on file name suffix
* Returns "application/octet-stream" if no corresponding mimeMap type.
* @param file the file * @param file the file
* @return the content-type guessed * @return the content-type guessed
*/ */
protected static String guessType(File file) { protected static String guessType(File file) {
String name = file.getName(); String name = file.getName();
String suffix = name.substring(name.lastIndexOf(".")+1); String suffix = name.substring(name.lastIndexOf(".")+1);
return mimeMap.get(suffix.toLowerCase(Locale.ROOT)); String type = mimeMap.get(suffix.toLowerCase(Locale.ROOT));
return (type != null) ? type : "application/octet-stream";
} }
/** /**

2
solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
View File

@ -145,7 +145,7 @@ public class SimplePostToolTest extends SolrTestCaseJ4 {
File f = new File("foo.doc"); File f = new File("foo.doc");
assertEquals("application/msword", SimplePostTool.guessType(f)); assertEquals("application/msword", SimplePostTool.guessType(f));
f = new File("foobar"); f = new File("foobar");
assertEquals(null, SimplePostTool.guessType(f)); assertEquals("application/octet-stream", SimplePostTool.guessType(f));
} }
@Test @Test