diff --git a/htroot/ConfigNetwork_p.java b/htroot/ConfigNetwork_p.java index 97e408c8c..341e1a02d 100644 --- a/htroot/ConfigNetwork_p.java +++ b/htroot/ConfigNetwork_p.java @@ -32,6 +32,7 @@ import java.util.Set; import net.yacy.cora.document.encoding.ASCII; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.util.CommonPattern; import net.yacy.data.WorkTables; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.MapTools; @@ -218,7 +219,7 @@ public class ConfigNetwork_p } 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(); for ( final String element : array ) { if ( (element.endsWith(".yacyh")) @@ -236,7 +237,7 @@ public class ConfigNetwork_p } 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(); for ( final String element : array ) { if ( element.indexOf(':', 0) >= 9 ) { diff --git a/htroot/IndexControlRWIs_p.java b/htroot/IndexControlRWIs_p.java index 8a5d5caf8..7542c2344 100644 --- a/htroot/IndexControlRWIs_p.java +++ b/htroot/IndexControlRWIs_p.java @@ -41,6 +41,7 @@ import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.storage.HandleSet; import net.yacy.cora.util.ByteBuffer; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.SpaceExceededException; import net.yacy.data.ListManager; @@ -374,7 +375,7 @@ public class IndexControlRWIs_p { Word.commonHashOrder, urlb.size()); if ( post.containsKey("blacklisturls") ) { - final String[] supportedBlacklistTypes = env.getConfig("BlackLists.types", "").split(","); + final String[] supportedBlacklistTypes = CommonPattern.COMMA.split(env.getConfig("BlackLists.types", "")); DigestURL url; for ( final byte[] b : urlb ) { try { diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index d8f5c27ff..70e125474 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -264,7 +264,7 @@ public class SettingsAck_p { final String remoteProxyPwd = post.get("remoteProxyPwd", ""); final String remoteProxyNoProxyStr = post.get("remoteProxyNoProxy", ""); - //String[] remoteProxyNoProxyPatterns = remoteProxyNoProxyStr.split(","); + //String[] remoteProxyNoProxyPatterns = CommonPattern.COMMA.split(remoteProxyNoProxyStr); /* ==================================================================== * Storing settings into config file diff --git a/htroot/ViewFile.java b/htroot/ViewFile.java index 7bcc55b71..cd9c0ee39 100644 --- a/htroot/ViewFile.java +++ b/htroot/ViewFile.java @@ -43,6 +43,7 @@ import net.yacy.cora.document.id.MultiProtocolURL; import net.yacy.cora.federate.yacy.CacheStrategy; import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.util.CommonPattern; import net.yacy.crawler.data.Cache; import net.yacy.crawler.retrieval.Response; import net.yacy.document.Condenser; @@ -452,7 +453,7 @@ public class ViewFile { } 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 CommonPattern.COMMA.split(words); if (words.indexOf('+',0) >= 0) return words.split("\\+"); w = new String[1]; w[0] = words; diff --git a/htroot/WebStructurePicture_p.java b/htroot/WebStructurePicture_p.java index ac1f372ac..52f2ba1b7 100644 --- a/htroot/WebStructurePicture_p.java +++ b/htroot/WebStructurePicture_p.java @@ -38,6 +38,7 @@ import net.yacy.cora.document.id.DigestURL; import net.yacy.cora.order.Base64Order; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.sorting.ClusteredScoreMap; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.peers.graphics.WebStructureGraph; import net.yacy.search.Switchboard; @@ -112,7 +113,7 @@ public class WebStructurePicture_p { } else { // recursively find domains, up to a specific depth GraphPlotter graph = new GraphPlotter(); - String[] hostlist = hosts.split(","); + String[] hostlist = CommonPattern.COMMA.split(hosts); for (int i = 0; i < hostlist.length; i++) { String host = hostlist[i]; String hash = null; diff --git a/htroot/api/feed.java b/htroot/api/feed.java index e4b5b7f9c..d14c5a2c4 100644 --- a/htroot/api/feed.java +++ b/htroot/api/feed.java @@ -6,6 +6,7 @@ import java.util.List; import net.yacy.cora.document.feed.RSSFeed; import net.yacy.cora.document.feed.RSSMessage; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.util.CommonPattern; import net.yacy.peers.EventChannel; import net.yacy.search.Switchboard; import net.yacy.server.serverObjects; @@ -28,7 +29,7 @@ public class feed { final String channelNames = post.get("set"); 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 messageMaxCount = Math.min(post.getInt("count", 100), 1000); diff --git a/htroot/api/table_p.java b/htroot/api/table_p.java index 3044fa5e9..46dff501b 100644 --- a/htroot/api/table_p.java +++ b/htroot/api/table_p.java @@ -26,6 +26,7 @@ import java.util.regex.Pattern; import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.SpaceExceededException; import net.yacy.kelondro.blob.Tables; @@ -132,7 +133,7 @@ public class table_p { // if a row attribute is given // 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++) { if (columns.contains(row[i])) { columns.remove(row[i]); diff --git a/htroot/api/timeline_p.java b/htroot/api/timeline_p.java index e25180b45..fda8e4e2a 100644 --- a/htroot/api/timeline_p.java +++ b/htroot/api/timeline_p.java @@ -36,6 +36,7 @@ import java.util.TreeMap; import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.sorting.OrderedScoreMap; +import net.yacy.cora.util.CommonPattern; import net.yacy.search.EventTracker.Event; import net.yacy.search.EventTracker; 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 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> proc = new HashMap<>(); for (String s: data) if (s.length() > 0) proc.put(s, null); diff --git a/htroot/yacy/list.java b/htroot/yacy/list.java index f17144fb5..b5c634d11 100644 --- a/htroot/yacy/list.java +++ b/htroot/yacy/list.java @@ -30,6 +30,7 @@ import java.io.File; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.util.CommonPattern; import net.yacy.kelondro.util.FileUtils; import net.yacy.peers.Seed; import net.yacy.peers.Protocol; @@ -72,7 +73,7 @@ public final class list { final StringBuilder out = new StringBuilder(10000); final String filenames=env.getConfig("BlackLists.Shared", ""); - final String[] filenamesarray = filenames.split(","); + final String[] filenamesarray = CommonPattern.COMMA.split(filenames); if (filenamesarray.length > 0){ for (final String filename : filenamesarray) { diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index 95810815c..111382952 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -54,6 +54,7 @@ import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.ResponseHeader; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.data.BookmarksDB.Bookmark; import net.yacy.data.DidYouMean; @@ -663,7 +664,7 @@ public class yacysearch { && sb.peers.mySeed().getFlagAcceptRemoteIndex(), false, lat, lon, rad, - sb.getConfig("search.navigation","").split(",")); + CommonPattern.COMMA.split(sb.getConfig("search.navigation",""))); EventTracker.delete(EventTracker.EClass.SEARCH); EventTracker.update(EventTracker.EClass.SEARCH, new ProfilingGraph.EventSearch( theQuery.id(true), diff --git a/source/net/yacy/contentcontrol/SMWListSyncThread.java b/source/net/yacy/contentcontrol/SMWListSyncThread.java index ff60ee7e0..ed4b432e4 100644 --- a/source/net/yacy/contentcontrol/SMWListSyncThread.java +++ b/source/net/yacy/contentcontrol/SMWListSyncThread.java @@ -8,6 +8,7 @@ import java.net.URL; import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.http.HTTPClient; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.search.Switchboard; @@ -80,8 +81,8 @@ public class SMWListSyncThread { + "/format%3Dystat"); String reply = UTF8.String(new HTTPClient(ClientIdentification.yacyInternetCrawlerAgent).GETbytes(urlCount.toString(), null, null, false)); - String overallcount = reply.split(",")[0]; - String lastsyncstring = reply.split(",")[1]; + String overallcount = CommonPattern.COMMA.split(reply)[0]; + String lastsyncstring = CommonPattern.COMMA.split(reply)[1]; this.currentmax = Integer.parseInt(overallcount); if (this.currentmax > 0) { diff --git a/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java b/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java index 642fde268..7743adf66 100644 --- a/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java +++ b/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java @@ -30,6 +30,7 @@ import java.util.Map; import net.yacy.cora.document.id.MultiProtocolURL; import net.yacy.cora.protocol.Domains; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.kelondro.util.MemoryControl; import net.yacy.search.schema.CollectionSchema; @@ -65,7 +66,7 @@ public class RemoteInstance implements SolrInstance { public static ArrayList getShardInstances(final String urlList, Collection coreNames, String defaultCoreName, final int timeout) throws IOException { urlList.replace(' ', ','); - String[] urls = urlList.split(","); + String[] urls = CommonPattern.COMMA.split(urlList); ArrayList instances = new ArrayList(); for (final String u: urls) { RemoteInstance instance = new RemoteInstance(u, coreNames, defaultCoreName, timeout); diff --git a/source/net/yacy/cora/geo/GeonamesLocation.java b/source/net/yacy/cora/geo/GeonamesLocation.java index db64492cf..cfc1da8eb 100644 --- a/source/net/yacy/cora/geo/GeonamesLocation.java +++ b/source/net/yacy/cora/geo/GeonamesLocation.java @@ -40,6 +40,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import net.yacy.cora.document.WordCache; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.StringBuilderComparator; @@ -135,7 +136,7 @@ public class GeonamesLocation implements Locations { locnames = new HashSet(); locnames.add(new StringBuilder(fields[1])); 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)); } final GeoLocation c = diff --git a/source/net/yacy/cora/geo/OpenGeoDBLocation.java b/source/net/yacy/cora/geo/OpenGeoDBLocation.java index 4f23f146d..02542d468 100644 --- a/source/net/yacy/cora/geo/OpenGeoDBLocation.java +++ b/source/net/yacy/cora/geo/OpenGeoDBLocation.java @@ -40,6 +40,7 @@ import java.util.TreeSet; import java.util.zip.GZIPInputStream; import net.yacy.cora.document.WordCache; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.StringBuilderComparator; @@ -98,15 +99,14 @@ public class OpenGeoDBLocation implements Locations //p = line.indexOf(' '); if (p < 0) continue; if ( line.startsWith("geodb_coordinates ") ) { line = line.substring(18 + 7); - v = line.split(","); - v = line.split(","); + v = CommonPattern.COMMA.split(line); lat = Float.parseFloat(v[2]); lon = Float.parseFloat(v[3]); this.id2loc.put(Integer.parseInt(v[0]), new GeoLocation(lat, lon)); } if ( line.startsWith("geodb_textdata ") ) { line = line.substring(15 + 7); - v = line.split(","); + v = CommonPattern.COMMA.split(line); if ( v[1].equals("500100000") ) { // Ortsname if (v.length > 10) { // a ',' is probably inside the location name diff --git a/source/net/yacy/cora/lod/vocabulary/Tagging.java b/source/net/yacy/cora/lod/vocabulary/Tagging.java index 5d7c7a2c2..535e71716 100644 --- a/source/net/yacy/cora/lod/vocabulary/Tagging.java +++ b/source/net/yacy/cora/lod/vocabulary/Tagging.java @@ -83,7 +83,7 @@ public class Tagging { } public String[] getSynonymsList() { - return this.synonyms.split(","); + return CommonPattern.COMMA.split(this.synonyms); } public String getObjectlink() { diff --git a/source/net/yacy/cora/storage/Files.java b/source/net/yacy/cora/storage/Files.java index 441bfab98..8b9cbea65 100644 --- a/source/net/yacy/cora/storage/Files.java +++ b/source/net/yacy/cora/storage/Files.java @@ -34,7 +34,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.zip.GZIPInputStream; diff --git a/source/net/yacy/crawler/data/CrawlProfile.java b/source/net/yacy/crawler/data/CrawlProfile.java index 1bcc83eab..a564dfb6a 100644 --- a/source/net/yacy/crawler/data/CrawlProfile.java +++ b/source/net/yacy/crawler/data/CrawlProfile.java @@ -298,7 +298,7 @@ public class CrawlProfile extends ConcurrentHashMap implements M public static Map collectionParser(String collectionString) { if (collectionString == null || collectionString.length() == 0) return new HashMap(); - String[] cs = collectionString.split(","); + String[] cs = CommonPattern.COMMA.split(collectionString); final Map cm = new LinkedHashMap(); for (String c: cs) { int p = c.indexOf(':'); @@ -390,7 +390,7 @@ public class CrawlProfile extends ConcurrentHashMap implements M String countryMustMatch = get(CRAWLER_COUNTRY_MUSTMATCH); if (countryMustMatch == null) countryMustMatch = CrawlProfile.MATCH_NEVER_STRING; 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]; return list; } diff --git a/source/net/yacy/data/BookmarksDB.java b/source/net/yacy/data/BookmarksDB.java index c232b85af..f6a394afd 100644 --- a/source/net/yacy/data/BookmarksDB.java +++ b/source/net/yacy/data/BookmarksDB.java @@ -40,6 +40,7 @@ import net.yacy.cora.document.encoding.ASCII; import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.id.DigestURL; import net.yacy.cora.order.NaturalOrder; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.SpaceExceededException; import net.yacy.kelondro.blob.MapHeap; @@ -91,7 +92,7 @@ public class BookmarksDB { 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; for (final String element : tagArray) { tag = getTag(BookmarkHelper.tagHash(element)); @@ -524,7 +525,7 @@ public class BookmarksDB { } public String getTagsString() { - final String s[] = ListManager.collection2string(getTags()).split(","); + final String s[] = CommonPattern.COMMA.split(ListManager.collection2string(getTags())); final StringBuilder stringBuilder = new StringBuilder(); for (final String element : s){ if(!element.startsWith("/")){ @@ -536,7 +537,7 @@ public class BookmarksDB { } public String getFoldersString(){ - final String s[] = ListManager.collection2string(getTags()).split(","); + final String s[] = CommonPattern.COMMA.split(ListManager.collection2string(getTags())); final StringBuilder stringBuilder = new StringBuilder(); for (final String element : s){ if(element.startsWith("/")){ diff --git a/source/net/yacy/data/ListManager.java b/source/net/yacy/data/ListManager.java index b6ebb26da..a115383c7 100644 --- a/source/net/yacy/data/ListManager.java +++ b/source/net/yacy/data/ListManager.java @@ -33,8 +33,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.Vector; -import java.util.regex.Pattern; - import net.yacy.cora.util.CommonPattern; import net.yacy.kelondro.util.FileUtils; import net.yacy.repository.Blacklist.BlacklistType; diff --git a/source/net/yacy/data/Translator.java b/source/net/yacy/data/Translator.java index e1ed98829..884029bdf 100644 --- a/source/net/yacy/data/Translator.java +++ b/source/net/yacy/data/Translator.java @@ -46,6 +46,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.Formatter; @@ -222,12 +223,12 @@ public class Translator { } public static Map langMap(@SuppressWarnings("unused") final serverSwitch env) { - final String[] ms = ( + final String[] ms = CommonPattern.COMMA.split( "default/English,de/Deutsch,fr/Français,nl/Nederlands,it/Italiano,es/Español,pt/Portugês,fi/Suomi,se/Svenska,dk/Dansk," + "gr/Eλληvικα,sk/Slovensky,cn/汉语/漢語," + "ru/Русский,uk/Українська," + "hi/हिन्दी" - ).split(","); + ); final Map map = new HashMap(); for (final String element : ms) { int p = element.indexOf('/'); diff --git a/source/net/yacy/document/Condenser.java b/source/net/yacy/document/Condenser.java index 3c6b94e1a..10b4f6f77 100644 --- a/source/net/yacy/document/Condenser.java +++ b/source/net/yacy/document/Condenser.java @@ -49,6 +49,7 @@ import net.yacy.cora.document.id.MultiProtocolURL; import net.yacy.cora.federate.solr.Ranking; import net.yacy.cora.language.synonyms.SynonymLibrary; import net.yacy.cora.lod.vocabulary.Tagging; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.document.language.Identificator; import net.yacy.document.parser.html.ImageEntry; @@ -474,7 +475,7 @@ public final class Condenser { for (int i = 0; i <= 15; i++) { sb.append('"'); final String s = p.getProperty("keywords" + i); - final String[] l = s.split(","); + final String[] l = CommonPattern.COMMA.split(s); for (final String element : l) { sb.append(ASCII.String(Word.word2hash(element))); } diff --git a/source/net/yacy/document/TextParser.java b/source/net/yacy/document/TextParser.java index b1c0bafe9..c731e3d9e 100644 --- a/source/net/yacy/document/TextParser.java +++ b/source/net/yacy/document/TextParser.java @@ -36,6 +36,7 @@ import java.util.concurrent.ConcurrentHashMap; import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.id.AnchorURL; import net.yacy.cora.document.id.MultiProtocolURL; +import net.yacy.cora.util.CommonPattern; import net.yacy.document.parser.apkParser; import net.yacy.document.parser.audioTagParser; import net.yacy.document.parser.bzipParser; @@ -464,7 +465,7 @@ public final class TextParser { public static void setDenyMime(final String denyList) { denyMime.clear(); String n; - for (final String s: denyList.split(",")) { + for (final String s: CommonPattern.COMMA.split(denyList)) { n = normalizeMimeType(s); 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) { 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() { diff --git a/source/net/yacy/document/parser/csvParser.java b/source/net/yacy/document/parser/csvParser.java index 7af75791c..dd8ae0d01 100644 --- a/source/net/yacy/document/parser/csvParser.java +++ b/source/net/yacy/document/parser/csvParser.java @@ -34,6 +34,7 @@ import java.util.Date; import java.util.List; import net.yacy.cora.document.id.AnchorURL; +import net.yacy.cora.util.CommonPattern; import net.yacy.document.AbstractParser; import net.yacy.document.Document; import net.yacy.document.Parser; @@ -109,7 +110,7 @@ public class csvParser extends AbstractParser implements Parser { if (row.isEmpty()) continue; if (separator == null) { // 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[] colt = row.split("\t"); if (colc.length >= cols.length && colc.length >= colt.length) separator = ","; diff --git a/source/net/yacy/document/parser/docParser.java b/source/net/yacy/document/parser/docParser.java index a09f9e391..909be3fe3 100644 --- a/source/net/yacy/document/parser/docParser.java +++ b/source/net/yacy/document/parser/docParser.java @@ -31,6 +31,7 @@ import java.io.InputStream; import java.util.Date; import net.yacy.cora.document.id.AnchorURL; +import net.yacy.cora.util.CommonPattern; import net.yacy.document.AbstractParser; import net.yacy.document.Document; import net.yacy.document.Parser; @@ -90,7 +91,7 @@ public class docParser extends AbstractParser implements Parser { final String keywords = extractor.getSummaryInformation().getKeywords(); final String[] keywlist; if (keywords != null && !keywords.isEmpty()) { - keywlist = keywords.split(","); + keywlist = CommonPattern.COMMA.split(keywords); } else { keywlist = null; } diff --git a/source/net/yacy/document/parser/images/genericImageParser.java b/source/net/yacy/document/parser/images/genericImageParser.java index cf5ec066b..51df60dc6 100644 --- a/source/net/yacy/document/parser/images/genericImageParser.java +++ b/source/net/yacy/document/parser/images/genericImageParser.java @@ -58,7 +58,6 @@ import net.yacy.document.parser.images.bmpParser.IMAGEMAP; import net.yacy.kelondro.util.FileUtils; import com.drew.imaging.jpeg.JpegMetadataReader; -import com.drew.imaging.jpeg.JpegProcessingException; import com.drew.lang.GeoLocation; import com.drew.metadata.Directory; import com.drew.metadata.Metadata; diff --git a/source/net/yacy/document/parser/pptParser.java b/source/net/yacy/document/parser/pptParser.java index e0773f2ba..78f4c2452 100644 --- a/source/net/yacy/document/parser/pptParser.java +++ b/source/net/yacy/document/parser/pptParser.java @@ -32,6 +32,7 @@ import java.io.InputStream; import java.util.Date; import net.yacy.cora.document.id.AnchorURL; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.document.AbstractParser; import net.yacy.document.Document; @@ -82,7 +83,7 @@ public class pptParser extends AbstractParser implements Parser { final String keywords = pptExtractor.getSummaryInformation().getKeywords(); final String[] keywlist; if (keywords != null && !keywords.isEmpty()) { - keywlist = keywords.split(","); + keywlist = CommonPattern.COMMA.split(keywords); } else keywlist = null; /* diff --git a/source/net/yacy/migration.java b/source/net/yacy/migration.java index f54ba3989..2f2765e4f 100644 --- a/source/net/yacy/migration.java +++ b/source/net/yacy/migration.java @@ -37,11 +37,9 @@ import net.yacy.search.Switchboard; import net.yacy.search.SwitchboardConstants; import com.google.common.io.Files; -import net.yacy.cora.lod.vocabulary.Tagging; import net.yacy.cora.protocol.TimeoutRequest; import net.yacy.cora.storage.Configuration.Entry; import net.yacy.cora.util.ConcurrentLog; -import net.yacy.document.LibraryProvider; import net.yacy.kelondro.workflow.BusyThread; import net.yacy.search.schema.CollectionConfiguration; import net.yacy.search.schema.CollectionSchema; diff --git a/source/net/yacy/peers/Protocol.java b/source/net/yacy/peers/Protocol.java index a68191616..c4efb1e7c 100644 --- a/source/net/yacy/peers/Protocol.java +++ b/source/net/yacy/peers/Protocol.java @@ -83,6 +83,7 @@ import net.yacy.cora.sorting.ClusteredScoreMap; import net.yacy.cora.sorting.ReversibleScoreMap; import net.yacy.cora.storage.HandleSet; import net.yacy.cora.util.ByteBuffer; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.JSONArray; import net.yacy.cora.util.JSONException; @@ -258,7 +259,7 @@ public final class Protocol { final String myIP = result.get("yourip"); // with the IPv6 extension, this may contain several ips, separated by comma ',' HashSet 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 (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.references = resultMap.get("references").split(","); + this.references = CommonPattern.COMMA.split(resultMap.get("references")); this.links = new ArrayList(this.availableCount); for ( int n = 0; n < this.availableCount; n++ ) { // get one single search result @@ -1323,7 +1324,7 @@ public final class Protocol { return null; } // all url's known, we are ready here - final String[] uhs = uhss.split(","); + final String[] uhs = CommonPattern.COMMA.split(uhss); if ( uhs.length == 0 ) { return null; } // all url's known diff --git a/source/net/yacy/peers/SeedDB.java b/source/net/yacy/peers/SeedDB.java index 936748505..533715e77 100644 --- a/source/net/yacy/peers/SeedDB.java +++ b/source/net/yacy/peers/SeedDB.java @@ -50,6 +50,7 @@ import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.http.HTTPClient; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.SpaceExceededException; import net.yacy.kelondro.blob.MapDataMining; @@ -356,7 +357,7 @@ public final class SeedDB implements AlternativeDomainNames { // address has therefore the form // address ::= ('.yacy'|'.yacyh'){'='{':' clustermap = new TreeSet<>(Base64Order.enhancedCoder); Seed seed; String hash, yacydom; diff --git a/source/net/yacy/repository/BlacklistFile.java b/source/net/yacy/repository/BlacklistFile.java index 00493ddd8..1d19b6fa2 100644 --- a/source/net/yacy/repository/BlacklistFile.java +++ b/source/net/yacy/repository/BlacklistFile.java @@ -30,6 +30,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import net.yacy.cora.util.CommonPattern; import net.yacy.repository.Blacklist.BlacklistType; public class BlacklistFile { @@ -52,7 +53,7 @@ public class BlacklistFile { * @return unified String array of file names */ public Set getFileNamesUnified() { - return new HashSet(Arrays.asList(this.filename.split(","))); + return new HashSet(Arrays.asList(CommonPattern.COMMA.split(this.filename))); } public BlacklistType getType() { return this.type; } diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java index 084faae18..db09708f1 100644 --- a/source/net/yacy/search/Switchboard.java +++ b/source/net/yacy/search/Switchboard.java @@ -114,6 +114,7 @@ import net.yacy.cora.protocol.TimeoutRequest; import net.yacy.cora.protocol.ftp.FTPClient; import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.cora.protocol.http.ProxySettings; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.Memory; 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 final String remoteProxyNoProxy = getConfig("remoteProxyNoProxy", "").trim(); - ProxySettings.noProxy = remoteProxyNoProxy.split(","); + ProxySettings.noProxy = CommonPattern.COMMA.split(remoteProxyNoProxy); // trim split entries int i = 0; for ( final String pattern : ProxySettings.noProxy ) { diff --git a/source/net/yacy/search/ranking/RankingProfile.java b/source/net/yacy/search/ranking/RankingProfile.java index cf1747988..5c219fd15 100644 --- a/source/net/yacy/search/ranking/RankingProfile.java +++ b/source/net/yacy/search/ranking/RankingProfile.java @@ -32,6 +32,7 @@ import java.util.Map; import net.yacy.cora.document.analysis.Classification; 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.NumberTools; @@ -133,7 +134,7 @@ public class RankingProfile { profile = profile.substring(1, profile.length() - 1); } 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; final int s = (prefix == null) ? 0 : prefix.length(); String e; diff --git a/source/net/yacy/server/http/HTTPDFileHandler.java b/source/net/yacy/server/http/HTTPDFileHandler.java index 68879f418..45a38703a 100644 --- a/source/net/yacy/server/http/HTTPDFileHandler.java +++ b/source/net/yacy/server/http/HTTPDFileHandler.java @@ -60,6 +60,7 @@ package net.yacy.server.http; import java.io.File; import net.yacy.cora.document.analysis.Classification; +import net.yacy.cora.util.CommonPattern; import net.yacy.cora.util.ConcurrentLog; import net.yacy.search.Switchboard; import net.yacy.search.SwitchboardConstants; @@ -109,7 +110,7 @@ public final class HTTPDFileHandler { public static final void initDefaultPath() { // 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"}; indexForward = switchboard.getConfig(SwitchboardConstants.INDEX_FORWARD, ""); if (indexForward.startsWith("/")) indexForward = indexForward.substring(1);