Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

*) fixed bug which affected blacklist entries which consisted of domain _and_ path parts

Browse Source 
*) minor cleanup

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7471 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
low012 2011-02-06 18:07:08 +00:00
parent 4843f04247
commit 74b22dfa24
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/net/yacy/repository/Blacklist.java
View File

@ -188,7 +188,7 @@ public class Blacklist {
List<String> paths;
List<String> loadedPaths;
final String[] fileNames = blFile.getFileNamesUnified();
final Set<String> fileNames = blFile.getFileNamesUnified();
for (final String fileName : fileNames) {
// make sure all requested blacklist files exist
final File file = new File(this.blacklistRootPath, fileName);
@ -262,7 +262,7 @@ public class Blacklist {
final String p = (path.length() > 0 && path.charAt(0) == '/') ? path.substring(1) : path;
final Map<String, List<String>> blacklistMap = getBlacklistMap(blacklistType, (isMatchable(host)) ? true : false);
final Map<String, List<String>> blacklistMap = getBlacklistMap(blacklistType, isMatchable(host));
// avoid PatternSyntaxException e
final String h =
@ -294,7 +294,7 @@ public class Blacklist {
if (blacklistType != null && host != null && path != null) {
final Map<String, List<String>> blacklistMap =
getBlacklistMap(blacklistType, (isMatchable(host)) ? true : false);
getBlacklistMap(blacklistType, isMatchable(host));
// avoid PatternSyntaxException e
final String h =
@ -380,13 +380,13 @@ public class Blacklist {
if ((app = blacklistMapMatched.get(hostlow.substring(0, index + 1) + "*")) != null) {
for (int i = app.size() - 1; !matched && i > -1; i--) {
pp = app.get(i);
matched |= (("*".equals(pp)) || (path.matches(pp)));
matched |= (("*".equals(pp)) || (p.matches(pp)));
}
}
if ((app = blacklistMapMatched.get(hostlow.substring(0, index))) != null) {
for (int i = app.size() - 1; !matched && i > -1; i--) {
pp = app.get(i);
matched |= (("*".equals(pp)) || (path.matches(pp)));
matched |= (("*".equals(pp)) || (p.matches(pp)));
}
}
}
@ -395,13 +395,13 @@ public class Blacklist {
if ((app = blacklistMapMatched.get("*" + hostlow.substring(index, hostlow.length()))) != null) {
for (int i = app.size() - 1; !matched && i > -1; i--) {
pp = app.get(i);
matched |= (("*".equals(pp)) || (path.matches(pp)));
matched |= (("*".equals(pp)) || (p.matches(pp)));
}
}
if ((app = blacklistMapMatched.get(hostlow.substring(index + 1, hostlow.length()))) != null) {
for (int i = app.size() - 1; !matched && i > -1; i--) {
pp = app.get(i);
matched |= (("*".equals(pp)) || (path.matches(pp)));
matched |= (("*".equals(pp)) || (p.matches(pp)));
}
}
}
@ -417,7 +417,7 @@ public class Blacklist {
if (Pattern.matches(key, hostlow)) {
app = entry.getValue();
for (int i = 0; i < app.size(); i++) {
if (Pattern.matches(app.get(i), path)) {
if (Pattern.matches(app.get(i), p)) {
return true;
}
}
@ -432,14 +432,10 @@ public class Blacklist {
public BlacklistError checkError(final String element, final Map<String, String> properties) {
boolean allowRegex = true;
final boolean allowRegex = (properties != null) && properties.get("allowRegex").equalsIgnoreCase("true");
int slashPos;
final String host, path;
if (properties != null) {
allowRegex = properties.get("allowRegex").equalsIgnoreCase("true") ? true : false;
}
if ((slashPos = element.indexOf('/')) == -1) {
host = element;
path = ".*";

7
source/net/yacy/repository/BlacklistFile.java
View File

@ -28,6 +28,7 @@ package net.yacy.repository;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
public class BlacklistFile {
@ -48,10 +49,8 @@ public class BlacklistFile {
*
* @return unified String array of file names
*/
public String[] getFileNamesUnified() {
final HashSet<String> hs = new HashSet<String>(Arrays.asList(this.filename.split(",")));
return hs.toArray(new String[hs.size()]);
public Set<String> getFileNamesUnified() {
return new HashSet<String>(Arrays.asList(this.filename.split(",")));
}
public String getType() { return this.type; }

6
source/net/yacy/repository/FilterEngine.java
View File

@ -217,14 +217,10 @@ public class FilterEngine {
public int checkError(String element, Map<String, String> properties) {
boolean allowRegex = true;
final boolean allowRegex = (properties != null) && properties.get("allowRegex").equalsIgnoreCase("true");
int slashPos;
String host, path;
if (properties != null) {
allowRegex = properties.get("allowRegex").equalsIgnoreCase("true") ? true : false;
}
if ((slashPos = element.indexOf('/')) == -1) {
host = element;
path = ".*";