diff --git a/htroot/ConfigLanguage_p.java b/htroot/ConfigLanguage_p.java index 8bfd0b916..c572f1fa7 100644 --- a/htroot/ConfigLanguage_p.java +++ b/htroot/ConfigLanguage_p.java @@ -98,7 +98,7 @@ public class ConfigLanguage_p { ArrayList langVector; try{ URL u = new URL(url); - langVector = nxTools.strings(httpc.wget(u, u.getHost(), 6000, null, null, switchboard.remoteProxyConfig)); + langVector = nxTools.strings(httpc.wget(u, u.getHost(), 6000, null, null, switchboard.remoteProxyConfig), "UTF-8"); }catch(IOException e){ prop.put("status", 1);//unable to get url prop.put("status_url", url); diff --git a/htroot/ConfigSkins_p.java b/htroot/ConfigSkins_p.java index 5e77bf11f..c71a32e46 100644 --- a/htroot/ConfigSkins_p.java +++ b/htroot/ConfigSkins_p.java @@ -127,7 +127,7 @@ public class ConfigSkins_p { ArrayList skinVector; try{ URL u = new URL(url); - skinVector = nxTools.strings(httpc.wget(u, u.getHost(), 6000, null, null, switchboard.remoteProxyConfig)); + skinVector = nxTools.strings(httpc.wget(u, u.getHost(), 6000, null, null, switchboard.remoteProxyConfig), "UTF-8"); }catch(IOException e){ prop.put("status", 1);//unable to get URL prop.put("status_url", url); diff --git a/htroot/sharedBlacklist_p.java b/htroot/sharedBlacklist_p.java index 2f04a4b88..afaf34af0 100644 --- a/htroot/sharedBlacklist_p.java +++ b/htroot/sharedBlacklist_p.java @@ -131,7 +131,7 @@ public class sharedBlacklist_p { // get List URL u = new URL(downloadURL); - otherBlacklist = nxTools.strings(httpc.wget(u, u.getHost(), 12000, null, null, switchboard.remoteProxyConfig,reqHeader)); + otherBlacklist = nxTools.strings(httpc.wget(u, u.getHost(), 12000, null, null, switchboard.remoteProxyConfig,reqHeader), "UTF-8"); } catch (Exception e) { prop.put("status", STATUS_PEER_UNKNOWN); prop.put("page", 1); @@ -147,7 +147,7 @@ public class sharedBlacklist_p { try { URL u = new URL(downloadURL); - otherBlacklist = nxTools.strings(httpc.wget(u, u.getHost(), 6000, null, null, switchboard.remoteProxyConfig)); //get List + otherBlacklist = nxTools.strings(httpc.wget(u, u.getHost(), 6000, null, null, switchboard.remoteProxyConfig), "UTF-8"); //get List } catch (Exception e) { prop.put("status", STATUS_URL_PROBLEM); prop.put("status_address",downloadURL); diff --git a/source/de/anomic/net/natLib.java b/source/de/anomic/net/natLib.java index fce2d34b2..9147edfe9 100644 --- a/source/de/anomic/net/natLib.java +++ b/source/de/anomic/net/natLib.java @@ -97,7 +97,7 @@ public class natLib { private static String getIPID() { try { - ArrayList x = nxTools.strings(httpc.wget(new URL("http://ipid.shat.net/"), "ipid.shat.net", 5000, null, null, null)); + ArrayList x = nxTools.strings(httpc.wget(new URL("http://ipid.shat.net/"), "ipid.shat.net", 5000, null, null, null), "UTF-8"); x = nxTools.grep(x, 2, "Your IP address"); String line = nxTools.tail1(x); return nxTools.awk(nxTools.awk(nxTools.awk(line, " ", 5), ">", 2), "<", 1); diff --git a/source/de/anomic/tools/nxTools.java b/source/de/anomic/tools/nxTools.java index 086080927..20da980fa 100644 --- a/source/de/anomic/tools/nxTools.java +++ b/source/de/anomic/tools/nxTools.java @@ -67,8 +67,8 @@ public class nxTools { return props; } - public static HashMap table(byte[] a) { - return table(strings(a)); + public static HashMap table(byte[] a, String encoding) { + return table(strings(a, encoding)); } public static HashMap table(ArrayList list) { diff --git a/source/de/anomic/yacy/yacyClient.java b/source/de/anomic/yacy/yacyClient.java index f3f8ab8d4..67ef67438 100644 --- a/source/de/anomic/yacy/yacyClient.java +++ b/source/de/anomic/yacy/yacyClient.java @@ -269,7 +269,7 @@ public final class yacyClient { (useProxy)?yacyCore.seedDB.sb.remoteProxyConfig:null, null ) - ); + , "UTF-8"); if (result == null || result.size() == 0) { return null; } //final Date remoteTime = yacyCore.parseUniversalDate((String) result.get(yacySeed.MYTIME)); // read remote time @@ -305,7 +305,7 @@ public final class yacyClient { null, (useProxy)?yacyCore.seedDB.sb.remoteProxyConfig:null ) - ); + , "UTF-8"); if (result == null || result.size() == 0) { return -1; } return Integer.parseInt((String) result.get("response")); @@ -346,7 +346,7 @@ public final class yacyClient { null, (useProxy)?yacyCore.seedDB.sb.remoteProxyConfig:null ) - ); + , "UTF-8"); // yacyCore.log("DEBUG QUERY: query=" + querystr + "; result = " + result.toString()); if ((result == null) || (result.size() == 0)) return -1; @@ -917,7 +917,7 @@ public final class yacyClient { null, (useProxy)?yacyCore.seedDB.sb.remoteProxyConfig:null ) - ); + , "UTF-8"); } catch (Exception e) { // most probably a network time-out exception yacyCore.log.logSevere("yacyClient.crawlReceipt error:" + e.getMessage()); @@ -1213,7 +1213,7 @@ public final class yacyClient { null, (useProxy)?yacyCore.seedDB.sb.remoteProxyConfig:null ) - ); + , "UTF-8"); System.out.println("Result=" + result.toString()); } catch (Exception e) { e.printStackTrace(); diff --git a/source/de/anomic/yacy/yacyPeerActions.java b/source/de/anomic/yacy/yacyPeerActions.java index 7aebb7313..9aff491d0 100644 --- a/source/de/anomic/yacy/yacyPeerActions.java +++ b/source/de/anomic/yacy/yacyPeerActions.java @@ -201,7 +201,7 @@ public class yacyPeerActions { yacyCore.log.logInfo("BOOTSTRAP: seed-list URL " + seedListFileURL + " too old (" + (header.age() / 86400000) + " days)"); } else { ssc++; - seedList = nxTools.strings(httpc.wget(url, url.getHost(), this.bootstrapLoadTimeout, null, null, this.sb.remoteProxyConfig,reqHeader)); + seedList = nxTools.strings(httpc.wget(url, url.getHost(), this.bootstrapLoadTimeout, null, null, this.sb.remoteProxyConfig,reqHeader), "UTF-8"); enu = seedList.iterator(); lc = 0; while (enu.hasNext()) { @@ -255,7 +255,7 @@ public class yacyPeerActions { // read in remote file from url try { URL u = new URL(url); - ArrayList remote = nxTools.strings(httpc.wget(u, u.getHost(), 5000, null, null, this.sb.remoteProxyConfig)); + ArrayList remote = nxTools.strings(httpc.wget(u, u.getHost(), 5000, null, null, this.sb.remoteProxyConfig), "UTF-8"); if ((remote != null) && (remote.size() > 0)) { Iterator e = remote.iterator(); while (e.hasNext()) { diff --git a/source/de/anomic/yacy/yacySeedDB.java b/source/de/anomic/yacy/yacySeedDB.java index fb28bda53..f7d344b67 100644 --- a/source/de/anomic/yacy/yacySeedDB.java +++ b/source/de/anomic/yacy/yacySeedDB.java @@ -722,7 +722,7 @@ public final class yacySeedDB { null, sb.remoteProxyConfig, reqHeader - )); + ), "UTF-8"); if (check == null) { serverLog.logFine("YACY","SaveSeedList: Testing download failed ...");