applying precompiled CommonPattern.COMMA.split to all places where

split(",") was used
pull/1/head
Michael Peter Christen 10 years ago
parent ac19690d30
commit 69eacdf4eb

@ -32,6 +32,7 @@ import java.util.Set;
import net.yacy.cora.document.encoding.ASCII; import net.yacy.cora.document.encoding.ASCII;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.util.CommonPattern;
import net.yacy.data.WorkTables; import net.yacy.data.WorkTables;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import net.yacy.kelondro.util.MapTools; import net.yacy.kelondro.util.MapTools;
@ -218,7 +219,7 @@ public class ConfigNetwork_p
} }
private static String checkYaCyDomainList(final String input) { private static String checkYaCyDomainList(final String input) {
final String[] array = normalizedList(input).split(","); final String[] array = CommonPattern.COMMA.split(normalizedList(input));
final StringBuilder output = new StringBuilder(); final StringBuilder output = new StringBuilder();
for ( final String element : array ) { for ( final String element : array ) {
if ( (element.endsWith(".yacyh")) if ( (element.endsWith(".yacyh"))
@ -236,7 +237,7 @@ public class ConfigNetwork_p
} }
private static String checkIPPortList(final String input) { private static String checkIPPortList(final String input) {
final String[] array = normalizedList(input).split(","); final String[] array = CommonPattern.COMMA.split(normalizedList(input));
final StringBuilder output = new StringBuilder(); final StringBuilder output = new StringBuilder();
for ( final String element : array ) { for ( final String element : array ) {
if ( element.indexOf(':', 0) >= 9 ) { if ( element.indexOf(':', 0) >= 9 ) {

@ -41,6 +41,7 @@ import net.yacy.cora.protocol.ClientIdentification;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.storage.HandleSet; import net.yacy.cora.storage.HandleSet;
import net.yacy.cora.util.ByteBuffer; import net.yacy.cora.util.ByteBuffer;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.SpaceExceededException; import net.yacy.cora.util.SpaceExceededException;
import net.yacy.data.ListManager; import net.yacy.data.ListManager;
@ -374,7 +375,7 @@ public class IndexControlRWIs_p {
Word.commonHashOrder, Word.commonHashOrder,
urlb.size()); urlb.size());
if ( post.containsKey("blacklisturls") ) { if ( post.containsKey("blacklisturls") ) {
final String[] supportedBlacklistTypes = env.getConfig("BlackLists.types", "").split(","); final String[] supportedBlacklistTypes = CommonPattern.COMMA.split(env.getConfig("BlackLists.types", ""));
DigestURL url; DigestURL url;
for ( final byte[] b : urlb ) { for ( final byte[] b : urlb ) {
try { try {

@ -264,7 +264,7 @@ public class SettingsAck_p {
final String remoteProxyPwd = post.get("remoteProxyPwd", ""); final String remoteProxyPwd = post.get("remoteProxyPwd", "");
final String remoteProxyNoProxyStr = post.get("remoteProxyNoProxy", ""); final String remoteProxyNoProxyStr = post.get("remoteProxyNoProxy", "");
//String[] remoteProxyNoProxyPatterns = remoteProxyNoProxyStr.split(","); //String[] remoteProxyNoProxyPatterns = CommonPattern.COMMA.split(remoteProxyNoProxyStr);
/* ==================================================================== /* ====================================================================
* Storing settings into config file * Storing settings into config file

@ -43,6 +43,7 @@ import net.yacy.cora.document.id.MultiProtocolURL;
import net.yacy.cora.federate.yacy.CacheStrategy; import net.yacy.cora.federate.yacy.CacheStrategy;
import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.ClientIdentification;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.util.CommonPattern;
import net.yacy.crawler.data.Cache; import net.yacy.crawler.data.Cache;
import net.yacy.crawler.retrieval.Response; import net.yacy.crawler.retrieval.Response;
import net.yacy.document.Condenser; import net.yacy.document.Condenser;
@ -452,7 +453,7 @@ public class ViewFile {
} }
words = UTF8.decodeURL(words); words = UTF8.decodeURL(words);
if (words.indexOf(' ',0) >= 0) return words.split(" "); if (words.indexOf(' ',0) >= 0) return words.split(" ");
if (words.indexOf(',',0) >= 0) return words.split(","); if (words.indexOf(',',0) >= 0) return CommonPattern.COMMA.split(words);
if (words.indexOf('+',0) >= 0) return words.split("\\+"); if (words.indexOf('+',0) >= 0) return words.split("\\+");
w = new String[1]; w = new String[1];
w[0] = words; w[0] = words;

@ -38,6 +38,7 @@ import net.yacy.cora.document.id.DigestURL;
import net.yacy.cora.order.Base64Order; import net.yacy.cora.order.Base64Order;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.sorting.ClusteredScoreMap; import net.yacy.cora.sorting.ClusteredScoreMap;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.peers.graphics.WebStructureGraph; import net.yacy.peers.graphics.WebStructureGraph;
import net.yacy.search.Switchboard; import net.yacy.search.Switchboard;
@ -112,7 +113,7 @@ public class WebStructurePicture_p {
} else { } else {
// recursively find domains, up to a specific depth // recursively find domains, up to a specific depth
GraphPlotter graph = new GraphPlotter(); GraphPlotter graph = new GraphPlotter();
String[] hostlist = hosts.split(","); String[] hostlist = CommonPattern.COMMA.split(hosts);
for (int i = 0; i < hostlist.length; i++) { for (int i = 0; i < hostlist.length; i++) {
String host = hostlist[i]; String host = hostlist[i];
String hash = null; String hash = null;

@ -6,6 +6,7 @@ import java.util.List;
import net.yacy.cora.document.feed.RSSFeed; import net.yacy.cora.document.feed.RSSFeed;
import net.yacy.cora.document.feed.RSSMessage; import net.yacy.cora.document.feed.RSSMessage;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.util.CommonPattern;
import net.yacy.peers.EventChannel; import net.yacy.peers.EventChannel;
import net.yacy.search.Switchboard; import net.yacy.search.Switchboard;
import net.yacy.server.serverObjects; import net.yacy.server.serverObjects;
@ -28,7 +29,7 @@ public class feed {
final String channelNames = post.get("set"); final String channelNames = post.get("set");
if (channelNames == null) return prop; if (channelNames == null) return prop;
final String[] channels = channelNames.split(","); // several channel names can be given and separated by comma final String[] channels = CommonPattern.COMMA.split(channelNames); // several channel names can be given and separated by comma
int messageCount = 0; int messageCount = 0;
int messageMaxCount = Math.min(post.getInt("count", 100), 1000); int messageMaxCount = Math.min(post.getInt("count", 100), 1000);

@ -26,6 +26,7 @@ import java.util.regex.Pattern;
import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.encoding.UTF8;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.SpaceExceededException; import net.yacy.cora.util.SpaceExceededException;
import net.yacy.kelondro.blob.Tables; import net.yacy.kelondro.blob.Tables;
@ -132,7 +133,7 @@ public class table_p {
// if a row attribute is given // if a row attribute is given
// then order the columns according to the given order // then order the columns according to the given order
final String[] row = post.get("row", "").split(","); final String[] row = CommonPattern.COMMA.split(post.get("row", ""));
for (int i = 0; i < row.length; i++) { for (int i = 0; i < row.length; i++) {
if (columns.contains(row[i])) { if (columns.contains(row[i])) {
columns.remove(row[i]); columns.remove(row[i]);

@ -36,6 +36,7 @@ import java.util.TreeMap;
import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.date.GenericFormatter;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.sorting.OrderedScoreMap; import net.yacy.cora.sorting.OrderedScoreMap;
import net.yacy.cora.util.CommonPattern;
import net.yacy.search.EventTracker.Event; import net.yacy.search.EventTracker.Event;
import net.yacy.search.EventTracker; import net.yacy.search.EventTracker;
import net.yacy.search.query.AccessTracker; import net.yacy.search.query.AccessTracker;
@ -66,7 +67,7 @@ public final class timeline_p {
else if (c == 'Y' || c == 'y') periodlength = p * 1000L * 60L * 60L * 24L * 365L; else if (c == 'Y' || c == 'y') periodlength = p * 1000L * 60L * 60L * 24L * 365L;
else periodlength = 0; else periodlength = 0;
} }
final String[] data = post.get("data", "").split(","); // a string of word hashes that shall be searched and combined final String[] data = CommonPattern.COMMA.split(post.get("data", "")); // a string of word hashes that shall be searched and combined
Map<String, List<EventTracker.Event>> proc = new HashMap<>(); Map<String, List<EventTracker.Event>> proc = new HashMap<>();
for (String s: data) if (s.length() > 0) proc.put(s, null); for (String s: data) if (s.length() > 0) proc.put(s, null);

@ -30,6 +30,7 @@ import java.io.File;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.util.CommonPattern;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import net.yacy.peers.Seed; import net.yacy.peers.Seed;
import net.yacy.peers.Protocol; import net.yacy.peers.Protocol;
@ -72,7 +73,7 @@ public final class list {
final StringBuilder out = new StringBuilder(10000); final StringBuilder out = new StringBuilder(10000);
final String filenames=env.getConfig("BlackLists.Shared", ""); final String filenames=env.getConfig("BlackLists.Shared", "");
final String[] filenamesarray = filenames.split(","); final String[] filenamesarray = CommonPattern.COMMA.split(filenames);
if (filenamesarray.length > 0){ if (filenamesarray.length > 0){
for (final String filename : filenamesarray) { for (final String filename : filenamesarray) {

@ -54,6 +54,7 @@ import net.yacy.cora.protocol.Domains;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.ResponseHeader;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.data.BookmarksDB.Bookmark; import net.yacy.data.BookmarksDB.Bookmark;
import net.yacy.data.DidYouMean; import net.yacy.data.DidYouMean;
@ -663,7 +664,7 @@ public class yacysearch {
&& sb.peers.mySeed().getFlagAcceptRemoteIndex(), && sb.peers.mySeed().getFlagAcceptRemoteIndex(),
false, false,
lat, lon, rad, lat, lon, rad,
sb.getConfig("search.navigation","").split(",")); CommonPattern.COMMA.split(sb.getConfig("search.navigation","")));
EventTracker.delete(EventTracker.EClass.SEARCH); EventTracker.delete(EventTracker.EClass.SEARCH);
EventTracker.update(EventTracker.EClass.SEARCH, new ProfilingGraph.EventSearch( EventTracker.update(EventTracker.EClass.SEARCH, new ProfilingGraph.EventSearch(
theQuery.id(true), theQuery.id(true),

@ -8,6 +8,7 @@ import java.net.URL;
import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.encoding.UTF8;
import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.ClientIdentification;
import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.cora.protocol.http.HTTPClient;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.search.Switchboard; import net.yacy.search.Switchboard;
@ -80,8 +81,8 @@ public class SMWListSyncThread {
+ "/format%3Dystat"); + "/format%3Dystat");
String reply = UTF8.String(new HTTPClient(ClientIdentification.yacyInternetCrawlerAgent).GETbytes(urlCount.toString(), null, null, false)); String reply = UTF8.String(new HTTPClient(ClientIdentification.yacyInternetCrawlerAgent).GETbytes(urlCount.toString(), null, null, false));
String overallcount = reply.split(",")[0]; String overallcount = CommonPattern.COMMA.split(reply)[0];
String lastsyncstring = reply.split(",")[1]; String lastsyncstring = CommonPattern.COMMA.split(reply)[1];
this.currentmax = Integer.parseInt(overallcount); this.currentmax = Integer.parseInt(overallcount);
if (this.currentmax > 0) { if (this.currentmax > 0) {

@ -30,6 +30,7 @@ import java.util.Map;
import net.yacy.cora.document.id.MultiProtocolURL; import net.yacy.cora.document.id.MultiProtocolURL;
import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.Domains;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.kelondro.util.MemoryControl; import net.yacy.kelondro.util.MemoryControl;
import net.yacy.search.schema.CollectionSchema; import net.yacy.search.schema.CollectionSchema;
@ -65,7 +66,7 @@ public class RemoteInstance implements SolrInstance {
public static ArrayList<RemoteInstance> getShardInstances(final String urlList, Collection<String> coreNames, String defaultCoreName, final int timeout) throws IOException { public static ArrayList<RemoteInstance> getShardInstances(final String urlList, Collection<String> coreNames, String defaultCoreName, final int timeout) throws IOException {
urlList.replace(' ', ','); urlList.replace(' ', ',');
String[] urls = urlList.split(","); String[] urls = CommonPattern.COMMA.split(urlList);
ArrayList<RemoteInstance> instances = new ArrayList<RemoteInstance>(); ArrayList<RemoteInstance> instances = new ArrayList<RemoteInstance>();
for (final String u: urls) { for (final String u: urls) {
RemoteInstance instance = new RemoteInstance(u, coreNames, defaultCoreName, timeout); RemoteInstance instance = new RemoteInstance(u, coreNames, defaultCoreName, timeout);

@ -40,6 +40,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
import net.yacy.cora.document.WordCache; import net.yacy.cora.document.WordCache;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.StringBuilderComparator; import net.yacy.cora.util.StringBuilderComparator;
@ -135,7 +136,7 @@ public class GeonamesLocation implements Locations {
locnames = new HashSet<StringBuilder>(); locnames = new HashSet<StringBuilder>();
locnames.add(new StringBuilder(fields[1])); locnames.add(new StringBuilder(fields[1]));
locnames.add(new StringBuilder(fields[2])); locnames.add(new StringBuilder(fields[2]));
for ( final String s : fields[3].split(",") ) { for ( final String s : CommonPattern.COMMA.split(fields[3]) ) {
locnames.add(new StringBuilder(s)); locnames.add(new StringBuilder(s));
} }
final GeoLocation c = final GeoLocation c =

@ -40,6 +40,7 @@ import java.util.TreeSet;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
import net.yacy.cora.document.WordCache; import net.yacy.cora.document.WordCache;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.StringBuilderComparator; import net.yacy.cora.util.StringBuilderComparator;
@ -98,15 +99,14 @@ public class OpenGeoDBLocation implements Locations
//p = line.indexOf(' '); if (p < 0) continue; //p = line.indexOf(' '); if (p < 0) continue;
if ( line.startsWith("geodb_coordinates ") ) { if ( line.startsWith("geodb_coordinates ") ) {
line = line.substring(18 + 7); line = line.substring(18 + 7);
v = line.split(","); v = CommonPattern.COMMA.split(line);
v = line.split(",");
lat = Float.parseFloat(v[2]); lat = Float.parseFloat(v[2]);
lon = Float.parseFloat(v[3]); lon = Float.parseFloat(v[3]);
this.id2loc.put(Integer.parseInt(v[0]), new GeoLocation(lat, lon)); this.id2loc.put(Integer.parseInt(v[0]), new GeoLocation(lat, lon));
} }
if ( line.startsWith("geodb_textdata ") ) { if ( line.startsWith("geodb_textdata ") ) {
line = line.substring(15 + 7); line = line.substring(15 + 7);
v = line.split(","); v = CommonPattern.COMMA.split(line);
if ( v[1].equals("500100000") ) { // Ortsname if ( v[1].equals("500100000") ) { // Ortsname
if (v.length > 10) { if (v.length > 10) {
// a ',' is probably inside the location name // a ',' is probably inside the location name

@ -83,7 +83,7 @@ public class Tagging {
} }
public String[] getSynonymsList() { public String[] getSynonymsList() {
return this.synonyms.split(","); return CommonPattern.COMMA.split(this.synonyms);
} }
public String getObjectlink() { public String getObjectlink() {

@ -34,7 +34,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;

@ -298,7 +298,7 @@ public class CrawlProfile extends ConcurrentHashMap<String, String> implements M
public static Map<String, Pattern> collectionParser(String collectionString) { public static Map<String, Pattern> collectionParser(String collectionString) {
if (collectionString == null || collectionString.length() == 0) return new HashMap<String, Pattern>(); if (collectionString == null || collectionString.length() == 0) return new HashMap<String, Pattern>();
String[] cs = collectionString.split(","); String[] cs = CommonPattern.COMMA.split(collectionString);
final Map<String, Pattern> cm = new LinkedHashMap<String, Pattern>(); final Map<String, Pattern> cm = new LinkedHashMap<String, Pattern>();
for (String c: cs) { for (String c: cs) {
int p = c.indexOf(':'); int p = c.indexOf(':');
@ -390,7 +390,7 @@ public class CrawlProfile extends ConcurrentHashMap<String, String> implements M
String countryMustMatch = get(CRAWLER_COUNTRY_MUSTMATCH); String countryMustMatch = get(CRAWLER_COUNTRY_MUSTMATCH);
if (countryMustMatch == null) countryMustMatch = CrawlProfile.MATCH_NEVER_STRING; if (countryMustMatch == null) countryMustMatch = CrawlProfile.MATCH_NEVER_STRING;
if (countryMustMatch.isEmpty()) return new String[0]; if (countryMustMatch.isEmpty()) return new String[0];
String[] list = countryMustMatch.split(","); String[] list = CommonPattern.COMMA.split(countryMustMatch);
if (list.length == 1 && list.length == 0) list = new String[0]; if (list.length == 1 && list.length == 0) list = new String[0];
return list; return list;
} }

@ -40,6 +40,7 @@ import net.yacy.cora.document.encoding.ASCII;
import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.encoding.UTF8;
import net.yacy.cora.document.id.DigestURL; import net.yacy.cora.document.id.DigestURL;
import net.yacy.cora.order.NaturalOrder; import net.yacy.cora.order.NaturalOrder;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.SpaceExceededException; import net.yacy.cora.util.SpaceExceededException;
import net.yacy.kelondro.blob.MapHeap; import net.yacy.kelondro.blob.MapHeap;
@ -91,7 +92,7 @@ public class BookmarksDB {
continue; continue;
} }
if (bookmark == null) continue; if (bookmark == null) continue;
tagArray = BookmarkHelper.cleanTagsString(bookmark.getTagsString() + bookmark.getFoldersString()).split(","); tagArray = CommonPattern.COMMA.split(BookmarkHelper.cleanTagsString(bookmark.getTagsString() + bookmark.getFoldersString()));
tag = null; tag = null;
for (final String element : tagArray) { for (final String element : tagArray) {
tag = getTag(BookmarkHelper.tagHash(element)); tag = getTag(BookmarkHelper.tagHash(element));
@ -524,7 +525,7 @@ public class BookmarksDB {
} }
public String getTagsString() { public String getTagsString() {
final String s[] = ListManager.collection2string(getTags()).split(","); final String s[] = CommonPattern.COMMA.split(ListManager.collection2string(getTags()));
final StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
for (final String element : s){ for (final String element : s){
if(!element.startsWith("/")){ if(!element.startsWith("/")){
@ -536,7 +537,7 @@ public class BookmarksDB {
} }
public String getFoldersString(){ public String getFoldersString(){
final String s[] = ListManager.collection2string(getTags()).split(","); final String s[] = CommonPattern.COMMA.split(ListManager.collection2string(getTags()));
final StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
for (final String element : s){ for (final String element : s){
if(element.startsWith("/")){ if(element.startsWith("/")){

@ -33,8 +33,6 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.Vector; import java.util.Vector;
import java.util.regex.Pattern;
import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.CommonPattern;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import net.yacy.repository.Blacklist.BlacklistType; import net.yacy.repository.Blacklist.BlacklistType;

@ -46,6 +46,7 @@ import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import net.yacy.kelondro.util.Formatter; import net.yacy.kelondro.util.Formatter;
@ -222,12 +223,12 @@ public class Translator {
} }
public static Map<String, String> langMap(@SuppressWarnings("unused") final serverSwitch env) { public static Map<String, String> langMap(@SuppressWarnings("unused") final serverSwitch env) {
final String[] ms = ( final String[] ms = CommonPattern.COMMA.split(
"default/English,de/Deutsch,fr/Fran&ccedil;ais,nl/Nederlands,it/Italiano,es/Espa&ntilde;ol,pt/Portug&ecirc;s,fi/Suomi,se/Svenska,dk/Dansk," + "default/English,de/Deutsch,fr/Fran&ccedil;ais,nl/Nederlands,it/Italiano,es/Espa&ntilde;ol,pt/Portug&ecirc;s,fi/Suomi,se/Svenska,dk/Dansk," +
"gr/E&lambda;&lambda;&eta;v&iota;&kappa;&alpha;,sk/Slovensky,cn/&#27721;&#35821;/&#28450;&#35486;," + "gr/E&lambda;&lambda;&eta;v&iota;&kappa;&alpha;,sk/Slovensky,cn/&#27721;&#35821;/&#28450;&#35486;," +
"ru/&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;,uk/&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072;," + "ru/&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;,uk/&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072;," +
"hi/&#2361;&#2367;&#2344;&#2381;&#2342;&#2368;" "hi/&#2361;&#2367;&#2344;&#2381;&#2342;&#2368;"
).split(","); );
final Map<String, String> map = new HashMap<String, String>(); final Map<String, String> map = new HashMap<String, String>();
for (final String element : ms) { for (final String element : ms) {
int p = element.indexOf('/'); int p = element.indexOf('/');

@ -49,6 +49,7 @@ import net.yacy.cora.document.id.MultiProtocolURL;
import net.yacy.cora.federate.solr.Ranking; import net.yacy.cora.federate.solr.Ranking;
import net.yacy.cora.language.synonyms.SynonymLibrary; import net.yacy.cora.language.synonyms.SynonymLibrary;
import net.yacy.cora.lod.vocabulary.Tagging; import net.yacy.cora.lod.vocabulary.Tagging;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.document.language.Identificator; import net.yacy.document.language.Identificator;
import net.yacy.document.parser.html.ImageEntry; import net.yacy.document.parser.html.ImageEntry;
@ -474,7 +475,7 @@ public final class Condenser {
for (int i = 0; i <= 15; i++) { for (int i = 0; i <= 15; i++) {
sb.append('"'); sb.append('"');
final String s = p.getProperty("keywords" + i); final String s = p.getProperty("keywords" + i);
final String[] l = s.split(","); final String[] l = CommonPattern.COMMA.split(s);
for (final String element : l) { for (final String element : l) {
sb.append(ASCII.String(Word.word2hash(element))); sb.append(ASCII.String(Word.word2hash(element)));
} }

@ -36,6 +36,7 @@ import java.util.concurrent.ConcurrentHashMap;
import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.encoding.UTF8;
import net.yacy.cora.document.id.AnchorURL; import net.yacy.cora.document.id.AnchorURL;
import net.yacy.cora.document.id.MultiProtocolURL; import net.yacy.cora.document.id.MultiProtocolURL;
import net.yacy.cora.util.CommonPattern;
import net.yacy.document.parser.apkParser; import net.yacy.document.parser.apkParser;
import net.yacy.document.parser.audioTagParser; import net.yacy.document.parser.audioTagParser;
import net.yacy.document.parser.bzipParser; import net.yacy.document.parser.bzipParser;
@ -464,7 +465,7 @@ public final class TextParser {
public static void setDenyMime(final String denyList) { public static void setDenyMime(final String denyList) {
denyMime.clear(); denyMime.clear();
String n; String n;
for (final String s: denyList.split(",")) { for (final String s: CommonPattern.COMMA.split(denyList)) {
n = normalizeMimeType(s); n = normalizeMimeType(s);
if (n != null && n.length() > 0) denyMime.put(n, v); if (n != null && n.length() > 0) denyMime.put(n, v);
} }
@ -485,7 +486,7 @@ public final class TextParser {
public static void setDenyExtension(final String denyList) { public static void setDenyExtension(final String denyList) {
denyExtensionx.clear(); denyExtensionx.clear();
for (final String s: denyList.split(",")) denyExtensionx.put(s, v); for (final String s: CommonPattern.COMMA.split(denyList)) denyExtensionx.put(s, v);
} }
public static String getDenyExtension() { public static String getDenyExtension() {

@ -34,6 +34,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
import net.yacy.cora.document.id.AnchorURL; import net.yacy.cora.document.id.AnchorURL;
import net.yacy.cora.util.CommonPattern;
import net.yacy.document.AbstractParser; import net.yacy.document.AbstractParser;
import net.yacy.document.Document; import net.yacy.document.Document;
import net.yacy.document.Parser; import net.yacy.document.Parser;
@ -109,7 +110,7 @@ public class csvParser extends AbstractParser implements Parser {
if (row.isEmpty()) continue; if (row.isEmpty()) continue;
if (separator == null) { if (separator == null) {
// try comma, semicolon and tab; take that one that results with more columns // try comma, semicolon and tab; take that one that results with more columns
final String[] colc = row.split(","); final String[] colc = CommonPattern.COMMA.split(row);
final String[] cols = row.split(";"); final String[] cols = row.split(";");
final String[] colt = row.split("\t"); final String[] colt = row.split("\t");
if (colc.length >= cols.length && colc.length >= colt.length) separator = ","; if (colc.length >= cols.length && colc.length >= colt.length) separator = ",";

@ -31,6 +31,7 @@ import java.io.InputStream;
import java.util.Date; import java.util.Date;
import net.yacy.cora.document.id.AnchorURL; import net.yacy.cora.document.id.AnchorURL;
import net.yacy.cora.util.CommonPattern;
import net.yacy.document.AbstractParser; import net.yacy.document.AbstractParser;
import net.yacy.document.Document; import net.yacy.document.Document;
import net.yacy.document.Parser; import net.yacy.document.Parser;
@ -90,7 +91,7 @@ public class docParser extends AbstractParser implements Parser {
final String keywords = extractor.getSummaryInformation().getKeywords(); final String keywords = extractor.getSummaryInformation().getKeywords();
final String[] keywlist; final String[] keywlist;
if (keywords != null && !keywords.isEmpty()) { if (keywords != null && !keywords.isEmpty()) {
keywlist = keywords.split(","); keywlist = CommonPattern.COMMA.split(keywords);
} else { } else {
keywlist = null; keywlist = null;
} }

@ -58,7 +58,6 @@ import net.yacy.document.parser.images.bmpParser.IMAGEMAP;
import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.FileUtils;
import com.drew.imaging.jpeg.JpegMetadataReader; import com.drew.imaging.jpeg.JpegMetadataReader;
import com.drew.imaging.jpeg.JpegProcessingException;
import com.drew.lang.GeoLocation; import com.drew.lang.GeoLocation;
import com.drew.metadata.Directory; import com.drew.metadata.Directory;
import com.drew.metadata.Metadata; import com.drew.metadata.Metadata;

@ -32,6 +32,7 @@ import java.io.InputStream;
import java.util.Date; import java.util.Date;
import net.yacy.cora.document.id.AnchorURL; import net.yacy.cora.document.id.AnchorURL;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.document.AbstractParser; import net.yacy.document.AbstractParser;
import net.yacy.document.Document; import net.yacy.document.Document;
@ -82,7 +83,7 @@ public class pptParser extends AbstractParser implements Parser {
final String keywords = pptExtractor.getSummaryInformation().getKeywords(); final String keywords = pptExtractor.getSummaryInformation().getKeywords();
final String[] keywlist; final String[] keywlist;
if (keywords != null && !keywords.isEmpty()) { if (keywords != null && !keywords.isEmpty()) {
keywlist = keywords.split(","); keywlist = CommonPattern.COMMA.split(keywords);
} else keywlist = null; } else keywlist = null;
/* /*

@ -37,11 +37,9 @@ import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants; import net.yacy.search.SwitchboardConstants;
import com.google.common.io.Files; import com.google.common.io.Files;
import net.yacy.cora.lod.vocabulary.Tagging;
import net.yacy.cora.protocol.TimeoutRequest; import net.yacy.cora.protocol.TimeoutRequest;
import net.yacy.cora.storage.Configuration.Entry; import net.yacy.cora.storage.Configuration.Entry;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.document.LibraryProvider;
import net.yacy.kelondro.workflow.BusyThread; import net.yacy.kelondro.workflow.BusyThread;
import net.yacy.search.schema.CollectionConfiguration; import net.yacy.search.schema.CollectionConfiguration;
import net.yacy.search.schema.CollectionSchema; import net.yacy.search.schema.CollectionSchema;

@ -83,6 +83,7 @@ import net.yacy.cora.sorting.ClusteredScoreMap;
import net.yacy.cora.sorting.ReversibleScoreMap; import net.yacy.cora.sorting.ReversibleScoreMap;
import net.yacy.cora.storage.HandleSet; import net.yacy.cora.storage.HandleSet;
import net.yacy.cora.util.ByteBuffer; import net.yacy.cora.util.ByteBuffer;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.JSONArray; import net.yacy.cora.util.JSONArray;
import net.yacy.cora.util.JSONException; import net.yacy.cora.util.JSONException;
@ -258,7 +259,7 @@ public final class Protocol {
final String myIP = result.get("yourip"); final String myIP = result.get("yourip");
// with the IPv6 extension, this may contain several ips, separated by comma ',' // with the IPv6 extension, this may contain several ips, separated by comma ','
HashSet<String> h = new HashSet<>(); HashSet<String> h = new HashSet<>();
for (String s: myIP.split(",")) { for (String s: CommonPattern.COMMA.split(myIP)) {
if (s.length() > 0 && Seed.isProperIP(s)) h.add(s); if (s.length() > 0 && Seed.isProperIP(s)) h.add(s);
} }
if (h.size() > 0) mySeed.setIPs(h); if (h.size() > 0) mySeed.setIPs(h);
@ -907,7 +908,7 @@ public final class Protocol {
this.indexabstract.put(UTF8.getBytes(entry.getKey().substring(14)), entry.getValue()); this.indexabstract.put(UTF8.getBytes(entry.getKey().substring(14)), entry.getValue());
} }
} }
this.references = resultMap.get("references").split(","); this.references = CommonPattern.COMMA.split(resultMap.get("references"));
this.links = new ArrayList<URIMetadataNode>(this.availableCount); this.links = new ArrayList<URIMetadataNode>(this.availableCount);
for ( int n = 0; n < this.availableCount; n++ ) { for ( int n = 0; n < this.availableCount; n++ ) {
// get one single search result // get one single search result
@ -1323,7 +1324,7 @@ public final class Protocol {
return null; return null;
} // all url's known, we are ready here } // all url's known, we are ready here
final String[] uhs = uhss.split(","); final String[] uhs = CommonPattern.COMMA.split(uhss);
if ( uhs.length == 0 ) { if ( uhs.length == 0 ) {
return null; return null;
} // all url's known } // all url's known

@ -50,6 +50,7 @@ import net.yacy.cora.protocol.Domains;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.cora.protocol.http.HTTPClient;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.SpaceExceededException; import net.yacy.cora.util.SpaceExceededException;
import net.yacy.kelondro.blob.MapDataMining; import net.yacy.kelondro.blob.MapDataMining;
@ -356,7 +357,7 @@ public final class SeedDB implements AlternativeDomainNames {
// address has therefore the form // address has therefore the form
// address ::= (<peername>'.yacy'|<peerhexhash>'.yacyh'){'='<ip>{':'<port}} // address ::= (<peername>'.yacy'|<peerhexhash>'.yacyh'){'='<ip>{':'<port}}
// clusterdef ::= {address}{','address}* // clusterdef ::= {address}{','address}*
final String[] addresses = (clusterdefinition.isEmpty()) ? new String[0] : clusterdefinition.split(","); final String[] addresses = (clusterdefinition.isEmpty()) ? new String[0] : CommonPattern.COMMA.split(clusterdefinition);
final TreeSet<byte[]> clustermap = new TreeSet<>(Base64Order.enhancedCoder); final TreeSet<byte[]> clustermap = new TreeSet<>(Base64Order.enhancedCoder);
Seed seed; Seed seed;
String hash, yacydom; String hash, yacydom;

@ -30,6 +30,7 @@ import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import net.yacy.cora.util.CommonPattern;
import net.yacy.repository.Blacklist.BlacklistType; import net.yacy.repository.Blacklist.BlacklistType;
public class BlacklistFile { public class BlacklistFile {
@ -52,7 +53,7 @@ public class BlacklistFile {
* @return unified String array of file names * @return unified String array of file names
*/ */
public Set<String> getFileNamesUnified() { public Set<String> getFileNamesUnified() {
return new HashSet<String>(Arrays.asList(this.filename.split(","))); return new HashSet<String>(Arrays.asList(CommonPattern.COMMA.split(this.filename)));
} }
public BlacklistType getType() { return this.type; } public BlacklistType getType() { return this.type; }

@ -114,6 +114,7 @@ import net.yacy.cora.protocol.TimeoutRequest;
import net.yacy.cora.protocol.ftp.FTPClient; import net.yacy.cora.protocol.ftp.FTPClient;
import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.cora.protocol.http.HTTPClient;
import net.yacy.cora.protocol.http.ProxySettings; import net.yacy.cora.protocol.http.ProxySettings;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.Memory; import net.yacy.cora.util.Memory;
import net.yacy.crawler.CrawlStacker; import net.yacy.crawler.CrawlStacker;
@ -3846,7 +3847,7 @@ public final class Switchboard extends serverSwitch {
// determining addresses for which the remote proxy should not be used // determining addresses for which the remote proxy should not be used
final String remoteProxyNoProxy = getConfig("remoteProxyNoProxy", "").trim(); final String remoteProxyNoProxy = getConfig("remoteProxyNoProxy", "").trim();
ProxySettings.noProxy = remoteProxyNoProxy.split(","); ProxySettings.noProxy = CommonPattern.COMMA.split(remoteProxyNoProxy);
// trim split entries // trim split entries
int i = 0; int i = 0;
for ( final String pattern : ProxySettings.noProxy ) { for ( final String pattern : ProxySettings.noProxy ) {

@ -32,6 +32,7 @@ import java.util.Map;
import net.yacy.cora.document.analysis.Classification; import net.yacy.cora.document.analysis.Classification;
import net.yacy.cora.document.analysis.Classification.ContentDomain; import net.yacy.cora.document.analysis.Classification.ContentDomain;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.NumberTools; import net.yacy.cora.util.NumberTools;
@ -133,7 +134,7 @@ public class RankingProfile {
profile = profile.substring(1, profile.length() - 1); profile = profile.substring(1, profile.length() - 1);
} }
profile = profile.trim(); profile = profile.trim();
if (profile.indexOf('&') > 0) elts = profile.split("&"); else elts = profile.split(","); if (profile.indexOf('&') > 0) elts = profile.split("&"); else elts = CommonPattern.COMMA.split(profile);
int p; int p;
final int s = (prefix == null) ? 0 : prefix.length(); final int s = (prefix == null) ? 0 : prefix.length();
String e; String e;

@ -60,6 +60,7 @@ package net.yacy.server.http;
import java.io.File; import java.io.File;
import net.yacy.cora.document.analysis.Classification; import net.yacy.cora.document.analysis.Classification;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.ConcurrentLog;
import net.yacy.search.Switchboard; import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants; import net.yacy.search.SwitchboardConstants;
@ -109,7 +110,7 @@ public final class HTTPDFileHandler {
public static final void initDefaultPath() { public static final void initDefaultPath() {
// create default files array // create default files array
defaultFiles = switchboard.getConfig(SwitchboardConstants.BROWSER_DEFAULT,"index.html").split(","); defaultFiles = CommonPattern.COMMA.split(switchboard.getConfig(SwitchboardConstants.BROWSER_DEFAULT,"index.html"));
if (defaultFiles.length == 0) defaultFiles = new String[] {"index.html"}; if (defaultFiles.length == 0) defaultFiles = new String[] {"index.html"};
indexForward = switchboard.getConfig(SwitchboardConstants.INDEX_FORWARD, ""); indexForward = switchboard.getConfig(SwitchboardConstants.INDEX_FORWARD, "");
if (indexForward.startsWith("/")) indexForward = indexForward.substring(1); if (indexForward.startsWith("/")) indexForward = indexForward.substring(1);

Loading…
Cancel
Save