From 57e6728cb7327a02ea0645378eb6da884f90fe2c Mon Sep 17 00:00:00 2001 From: orbiter Date: Mon, 21 Feb 2011 11:53:45 +0000 Subject: [PATCH] - removed usage of /etc/alternatives/www-browser because of problems with lynx, see: http://forum.yacy-websuche.de/viewtopic.php?p=21959#p21959 please look if the browser that is linked with /etc/alternatives/www-browser can be detected and insert call again if it can be made sure that this does not call lynx - replaced severe warnings with just warnings in yacyClient git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7506 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- source/de/anomic/yacy/yacyClient.java | 22 +++++++++++----------- source/net/yacy/gui/framework/Browser.java | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/source/de/anomic/yacy/yacyClient.java b/source/de/anomic/yacy/yacyClient.java index 0a6ad6806..89377f93b 100644 --- a/source/de/anomic/yacy/yacyClient.java +++ b/source/de/anomic/yacy/yacyClient.java @@ -221,7 +221,7 @@ public final class yacyClient { final String error = mySeed.isProper(true); if (error != null) { - yacyCore.log.logSevere("yacyClient.hello mySeed error - not proper: " + error); + yacyCore.log.logWarning("yacyClient.hello mySeed error - not proper: " + error); return -1; } @@ -265,7 +265,7 @@ public final class yacyClient { //final Date remoteTime = yacyCore.parseUniversalDate((String) result.get(yacySeed.MYTIME)); // read remote time return yacySeed.genRemoteSeed(result.get("response"), salt, false); } catch (final Exception e) { - yacyCore.log.logSevere("yacyClient.querySeed error:" + e.getMessage()); + yacyCore.log.logWarning("yacyClient.querySeed error:" + e.getMessage()); return null; } } @@ -286,7 +286,7 @@ public final class yacyClient { if (result == null || result.isEmpty()) { return -1; } return Integer.parseInt(result.get("response")); } catch (final Exception e) { - yacyCore.log.logSevere("yacyClient.queryRWICount error:" + e.getMessage()); + yacyCore.log.logWarning("yacyClient.queryRWICount error:" + e.getMessage()); return -1; } } @@ -364,7 +364,7 @@ public final class yacyClient { seedDB.update(target.hash, target); return feed; } catch (final IOException e) { - yacyCore.log.logSevere("yacyClient.queryRemoteCrawlURLs error asking peer '" + target.getName() + "':" + e.toString()); + yacyCore.log.logWarning("yacyClient.queryRemoteCrawlURLs error asking peer '" + target.getName() + "':" + e.toString()); return null; } } @@ -479,7 +479,7 @@ public final class yacyClient { indexSegment.urlMetadata().store(urlEntry); ResultURLs.stack(urlEntry, mySeed.hash.getBytes(), target.hash.getBytes(), EventOrigin.QUERIES); } catch (final IOException e) { - yacyCore.log.logSevere("could not store search result", e); + yacyCore.log.logWarning("could not store search result", e); continue; // db-error } @@ -695,7 +695,7 @@ public final class yacyClient { return result; } catch (final Exception e) { // most probably a network time-out exception - yacyCore.log.logSevere("yacyClient.permissionMessage error:" + e.getMessage()); + yacyCore.log.logWarning("yacyClient.permissionMessage error:" + e.getMessage()); return null; } } @@ -721,7 +721,7 @@ public final class yacyClient { final Map result = FileUtils.table(content); return result; } catch (final Exception e) { - yacyCore.log.logSevere("yacyClient.postMessage error:" + e.getMessage()); + yacyCore.log.logWarning("yacyClient.postMessage error:" + e.getMessage()); return null; } } @@ -787,7 +787,7 @@ public final class yacyClient { return FileUtils.table(content); } catch (final Exception e) { // most probably a network time-out exception - yacyCore.log.logSevere("yacyClient.crawlReceipt error:" + e.getMessage()); + yacyCore.log.logWarning("yacyClient.crawlReceipt error:" + e.getMessage()); return null; } } @@ -888,7 +888,7 @@ public final class yacyClient { return null; } catch (UnsupportedEncodingException e) { - yacyCore.log.logSevere("yacyClient.transferIndex error:" + e.getMessage()); + yacyCore.log.logWarning("yacyClient.transferIndex error:" + e.getMessage()); return null; } finally { resultObj.put("payloadSize", Integer.valueOf(payloadSize)); @@ -990,7 +990,7 @@ public final class yacyClient { result.put("urlPayloadSize", Integer.toString(urlPayloadSize)); return result; } catch (final Exception e) { - yacyCore.log.logSevere("yacyClient.transferURL to " + address + " error: " + e.getMessage()); + yacyCore.log.logWarning("yacyClient.transferURL to " + address + " error: " + e.getMessage()); return null; } } @@ -1007,7 +1007,7 @@ public final class yacyClient { final byte[] content = HTTPConnector.getConnector(MultiProtocolURI.yacybotUserAgent).post(new MultiProtocolURI("http://" + address + "/yacy/profile.html"), 5000, targetSeed.getHexHash() + ".yacyh", parts); return FileUtils.table(content); } catch (final Exception e) { - yacyCore.log.logSevere("yacyClient.getProfile error:" + e.getMessage()); + yacyCore.log.logWarning("yacyClient.getProfile error:" + e.getMessage()); return null; } } diff --git a/source/net/yacy/gui/framework/Browser.java b/source/net/yacy/gui/framework/Browser.java index 800f458db..ae69cc2ee 100644 --- a/source/net/yacy/gui/framework/Browser.java +++ b/source/net/yacy/gui/framework/Browser.java @@ -83,11 +83,11 @@ public class Browser { if (systemOS == systemMacOSX) { openBrowserMac(url); } else if (systemOS == systemUnix) { - try { - openBrowserUnixGeneric(url); - } catch (Exception e) { + //try { + // openBrowserUnixGeneric(url); + //} catch (Exception e) { openBrowserUnixFirefox(url); - } + //} } else if (systemOS == systemWindows) { openBrowserWin(url); } else { @@ -120,14 +120,14 @@ public class Browser { p.waitFor(); if (p.exitValue() != 0) throw new RuntimeException("Unix Exec Error/Firefox: " + errorResponse(p)); } - + /* private static void openBrowserUnixGeneric(final String url) throws Exception { String cmd = "/etc/alternatives/www-browser " + url; Process p = Runtime.getRuntime().exec(cmd); p.waitFor(); if (p.exitValue() != 0) throw new RuntimeException("Unix Exec Error/generic: " + errorResponse(p)); } - + */ private static void openBrowserWin(final String url) throws Exception { // see forum at http://forum.java.sun.com/thread.jsp?forum=57&thread=233364&message=838441 String cmd;