boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

added a patch to ignore bad mime-ignore patterns

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6474 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 15 years ago
parent 29fe436e36
commit 1a146b0d73
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File

18
source/net/yacy/document/TextParser.java
Unescape View File

@ -274,7 +274,7 @@ public final class TextParser {
String ext = url.getFileExtension(); String ext = url.getFileExtension();
Idiom idiom; Idiom idiom;
if (ext != null && ext.length() > 0) { if (ext != null && ext.length() > 0) {
if (denyExtension.contains(ext)) throw new ParserException("file extension '" + ext + "' is denied", url); if (denyExtension.contains(ext)) throw new ParserException("file extension '" + ext + "' is denied (1)", url);
idiom = ext2parser.get(ext); idiom = ext2parser.get(ext);
if (idiom != null) idioms.add(idiom); if (idiom != null) idioms.add(idiom);
} }
@ -282,7 +282,7 @@ public final class TextParser {
// check given mime type // check given mime type
if (mimeType1 != null) { if (mimeType1 != null) {
mimeType1 = normalizeMimeType(mimeType1); mimeType1 = normalizeMimeType(mimeType1);
if (denyMime.contains(mimeType1)) throw new ParserException("mime type '" + mimeType1 + "' is denied", url); if (denyMime.contains(mimeType1)) throw new ParserException("mime type '" + mimeType1 + "' is denied (1)", url);
idiom = mime2parser.get(mimeType1); idiom = mime2parser.get(mimeType1);
if (idiom != null && !idioms.contains(idiom)) idioms.add(idiom); if (idiom != null && !idioms.contains(idiom)) idioms.add(idiom);
} }
@ -299,7 +299,7 @@ public final class TextParser {
public static String supportsMime(String mimeType) { public static String supportsMime(String mimeType) {
if (mimeType == null) return null; if (mimeType == null) return null;
mimeType = normalizeMimeType(mimeType); mimeType = normalizeMimeType(mimeType);
if (denyMime.contains(mimeType)) return "mime type '" + mimeType + "' is denied"; if (denyMime.contains(mimeType)) return "mime type '" + mimeType + "' is denied (2)";
if (mime2parser.get(mimeType) == null) return "no parser for mime '" + mimeType + "' available"; if (mime2parser.get(mimeType) == null) return "no parser for mime '" + mimeType + "' available";
return null; return null;
} }
@ -307,7 +307,7 @@ public final class TextParser {
public static String supportsExtension(final DigestURI url) { public static String supportsExtension(final DigestURI url) {
String ext = url.getFileExtension(); String ext = url.getFileExtension();
if (ext == null || ext.length() == 0) return null; if (ext == null || ext.length() == 0) return null;
if (denyExtension.contains(ext)) return "file extension '" + ext + "' is denied"; if (denyExtension.contains(ext)) return "file extension '" + ext + "' is denied (2)";
String mimeType = ext2mime.get(ext); String mimeType = ext2mime.get(ext);
if (mimeType == null) return "no parser available"; if (mimeType == null) return "no parser available";
Idiom idiom = mime2parser.get(mimeType); Idiom idiom = mime2parser.get(mimeType);
@ -332,7 +332,11 @@ public final class TextParser {
public static void setDenyMime(String denyList) { public static void setDenyMime(String denyList) {
denyMime.clear(); denyMime.clear();
for (String s: denyList.split(",")) denyMime.add(normalizeMimeType(s)); String n;
for (String s: denyList.split(",")) {
n = normalizeMimeType(s);
if (n != null && n.length() > 0) denyMime.add(n);
}
} }
public static String getDenyMime() { public static String getDenyMime() {
@ -343,7 +347,9 @@ public final class TextParser {
} }
public static void grantMime(String mime, boolean grant) { public static void grantMime(String mime, boolean grant) {
if (grant) denyMime.remove(normalizeMimeType(mime)); else denyMime.add(normalizeMimeType(mime)); String n = normalizeMimeType(mime);
if (n == null || n.length() == 0) return;
if (grant) denyMime.remove(n); else denyMime.add(n);
} }
public static void setDenyExtension(String denyList) { public static void setDenyExtension(String denyList) {

Write Preview
Loading…
Cancel
Save