From 18a5380ee3756fb5c799ac00fdfe9eafc4335f2c Mon Sep 17 00:00:00 2001 From: rramthun Date: Thu, 7 Jun 2007 15:26:41 +0000 Subject: [PATCH] *) situation-dependent lock-buttons for search-page *) removed one unused import and a double definition of "ogg" as media-type git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3817 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/ConfigBasic.html | 2 +- htroot/index.html | 37 ++++++++++--------- htroot/index.java | 1 + htroot/yacysearch.java | 1 - locales/de.lng | 2 +- .../plasma/crawler/http/CrawlWorker.java | 6 +-- source/de/anomic/plasma/plasmaParser.java | 4 +- 7 files changed, 28 insertions(+), 25 deletions(-) diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.html index cb40a1751..045b36c33 100644 --- a/htroot/ConfigBasic.html +++ b/htroot/ConfigBasic.html @@ -56,7 +56,7 @@
  • - #(statusPort)#warning Your peer cannot be reached from outside (what is not fatal, but would be good for the YaCy network); please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port.::ok Your peer can be reached by other peers#(/statusPort)#
    + #(statusPort)#warning Your peer cannot be reached from outside (which is not fatal, but would be good for the YaCy network); please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port.::ok Your peer can be reached by other peers#(/statusPort)#
    diff --git a/htroot/index.html b/htroot/index.html index e1bf157fa..2e1f910da 100644 --- a/htroot/index.html +++ b/htroot/index.html @@ -10,8 +10,8 @@ #(display)# #%env/templates/simpleheader.template%# :: - #%env/templates/header.template%# - :: + #%env/templates/header.template%# + :: #%env/templates/embeddedheader.template%# #(/display)# @@ -111,25 +111,28 @@ #(/searchoptions)#

    This peer holds #[links]# URLs of #[total-links]# in the known network.

    - #(searchoptions)#:: -

    -

    - - -
    -

    + #(searchoptions)#:: +

    +

    + #(publicSearchpage)# + + :: + + #(/publicSearchpage)# +
    +

    #(/searchoptions)# #(display)# #%env/templates/simplefooter.template%# :: - #%env/templates/footer.template%# - :: + #%env/templates/footer.template%# + :: #%env/templates/embeddedfooter.template%# #(/display)# diff --git a/htroot/index.java b/htroot/index.java index a4d5ea884..1265d10b0 100644 --- a/htroot/index.java +++ b/htroot/index.java @@ -138,6 +138,7 @@ public class index { prop.put("searchoptions_prefermaskoptions", 0); prop.put("searchoptions_prefermaskoptions_prefermaskfilter", prefermaskfilter); prop.put("searchoptions_indexofChecked", ""); + prop.put("searchoptions_publicSearchpage", (publicPage == true) ? 0 : 1); prop.put("results", ""); prop.put("cat", cat); prop.put("type", type); diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index bf2e30426..e3a479ead 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -52,7 +52,6 @@ import java.net.MalformedURLException; import java.net.URLEncoder; import java.util.HashMap; import java.util.Iterator; -import java.util.Set; import java.util.regex.PatternSyntaxException; import java.util.TreeSet; diff --git a/locales/de.lng b/locales/de.lng index 787c3ac95..a2e9483b1 100644 --- a/locales/de.lng +++ b/locales/de.lng @@ -204,7 +204,7 @@ Peer User:==Peer-Nutzer: New Peer Password:==Neues Peer-Passwort: Repeat Peer Password:==Peer-Passwort bestätigen: Your peer cannot be reached from outside==Ihr Peer kann nicht von außen erreicht werden -what is not fatal, but would be good for the YaCy network==was nicht schlimm ist, aber anders wäre für das YaCy-Netzwerk noch besser +which is not fatal, but would be good for the YaCy network==was nicht schlimm ist, aber anders wäre für das YaCy-Netzwerk noch besser please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port==Bitte öffnen Sie Ihre Firewall auf diesem Port und/oder stellen Sie einen virtuellen Server in Ihrem Router ein um Verbindungen auf diesem Port zu erlauben Your peer can be reached by other peers==Ihr Peer kann von anderen Peers erreicht werden Peer Port:==Peer-Port: diff --git a/source/de/anomic/plasma/crawler/http/CrawlWorker.java b/source/de/anomic/plasma/crawler/http/CrawlWorker.java index cbf8cb8c5..91435f652 100644 --- a/source/de/anomic/plasma/crawler/http/CrawlWorker.java +++ b/source/de/anomic/plasma/crawler/http/CrawlWorker.java @@ -119,7 +119,7 @@ public final class CrawlWorker extends AbstractCrawlWorker { } public void init() { - // refreshing timeout value + // refreshing timeout value if (this.theMsg.timeout < 0) { this.socketTimeout = (int) this.sb.getConfigLong("crawler.clientTimeout", 10000); } else { @@ -267,7 +267,7 @@ public final class CrawlWorker extends AbstractCrawlWorker { fos = new httpdBoundedSizeOutputStream(fos,this.maxFileSize); } else if (contentLength > this.maxFileSize) { remote.close(); - this.log.logInfo("REJECTED URL " + this.url + " because file size '" + contentLength + "' exceeds max filesize limit."); + this.log.logInfo("REJECTED URL " + this.url + " because file size '" + contentLength + "' exceeds max filesize limit of " + this.maxFileSize + " bytes."); addURLtoErrorDB(plasmaCrawlEURL.DENIED_FILESIZE_LIMIT_EXCEEDED); return null; } @@ -492,4 +492,4 @@ public final class CrawlWorker extends AbstractCrawlWorker { } catch (Exception e) {/* ignore this. shutdown in progress */} } } -} \ No newline at end of file +} diff --git a/source/de/anomic/plasma/plasmaParser.java b/source/de/anomic/plasma/plasmaParser.java index 51554ef44..0b7921b96 100644 --- a/source/de/anomic/plasma/plasmaParser.java +++ b/source/de/anomic/plasma/plasmaParser.java @@ -172,8 +172,8 @@ public final class plasmaParser { * @see #initMediaExt(String) */ static { - String apps = "sit,hqx,img,dmg,exe,com,bat,sh,zip,jar"; - String audio = "mp2,mp3,ogg,aac,aif,aiff,wav,ogg"; + String apps = "sit,hqx,img,dmg,exe,com,bat,sh,vbs,zip,jar"; + String audio = "mp2,mp3,ogg,aac,aif,aiff,wav"; String video = "swf,avi,wmv,rm,mov,mpg,mpeg,ram,m4v"; String image = "jpg,jpeg,jpe,gif,png"; initMediaExt(extString2extList(