s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up a couple more format guessing issues left over from #685

Browse Source
This commit is contained in:
Tom Morris 2013-03-06 20:39:39 -05:00
parent ca09ae6f90
commit d8d82bf8b7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/com/google/refine/importers/LineBasedFormatGuesser.java
View File

@ -13,7 +13,7 @@ public class LineBasedFormatGuesser implements FormatGuesser {
return "text/line-based/*sv"; return "text/line-based/*sv";
} }
int[] widths = FixedWidthImporter.guessColumnWidths(file, encoding); int[] widths = FixedWidthImporter.guessColumnWidths(file, encoding);
if (widths != null) { if (widths != null && widths.length > 0) {
return "text/line-based/fixed-width"; return "text/line-based/fixed-width";
} }
return null; return null;

4
main/src/com/google/refine/importing/ImportingManager.java
View File

@ -270,7 +270,9 @@ public class ImportingManager {
static public String getFormat(String fileName, String mimeType) { static public String getFormat(String fileName, String mimeType) {
String fileNameFormat = getFormatFromFileName(fileName); String fileNameFormat = getFormatFromFileName(fileName);
mimeType = mimeType.split(";")[0]; if (mimeType != null) {
mimeType = mimeType.split(";")[0];
}
String mimeTypeFormat = mimeType == null ? null : getFormatFromMimeType(mimeType); String mimeTypeFormat = mimeType == null ? null : getFormatFromMimeType(mimeType);
if (mimeTypeFormat == null) { if (mimeTypeFormat == null) {
return fileNameFormat; return fileNameFormat;