From 85773ebd4f3481dcee19b94b299d4e7fbe091d7f Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Sun, 21 Dec 2014 17:53:06 +0100 Subject: [PATCH] removed debug lines --- htroot/ConfigParser.html | 32 ++++++++++++++++++++++++++------ htroot/ConfigParser.java | 11 +++++++++++ htroot/yacy/hello.java | 15 +++++++-------- 3 files changed, 44 insertions(+), 14 deletions(-) diff --git a/htroot/ConfigParser.html b/htroot/ConfigParser.html index 21811663e..20e6944ee 100644 --- a/htroot/ConfigParser.html +++ b/htroot/ConfigParser.html @@ -28,12 +28,12 @@

- - - + + + #{parser}# - + #{ext}# @@ -47,12 +47,32 @@ #{/mime}# #{/parser}# - +
enable/disableExtensionMime-TypeExtensionMime-Type
#[name]##[name]#
+
PDF Parser Attributes +

+ This is an experimental setting which makes it possible to split PDF documents into individual index entries. + Every page will become a single index hit and the url is artifically extended with a post/get attribute value containing + the page number as value. When such an url is displayed within a search result, then the post/get attribute is transformed into an anchor hash link. + This makes it possible to view the individual page directly in the pdf.js viewer built-in into firefox, + for reference see https://github.com/mozilla/pdf.js/wiki/Viewer-options +

+ + + + + + + + + + + + +
Split PDF
Property Name
- #%env/templates/footer.template%# diff --git a/htroot/ConfigParser.java b/htroot/ConfigParser.java index 7773819fb..32510ecb2 100644 --- a/htroot/ConfigParser.java +++ b/htroot/ConfigParser.java @@ -28,6 +28,7 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.Parser; import net.yacy.document.TextParser; +import net.yacy.document.parser.pdfParser; import net.yacy.search.Switchboard; import net.yacy.search.SwitchboardConstants; import net.yacy.server.serverObjects; @@ -63,6 +64,13 @@ public class ConfigParser { env.setConfig(SwitchboardConstants.PARSER_MIME_DENY, TextParser.getDenyMime()); env.setConfig(SwitchboardConstants.PARSER_EXTENSIONS_DENY, TextParser.getDenyExtension()); } + + if (post.containsKey("pdfSettings")) { + env.setConfig(SwitchboardConstants.PARSER_PDF_INDIVIDUALPAGES, post.getBoolean("individualPages")); + env.setConfig(SwitchboardConstants.PARSER_PDF_INDIVIDUALPAGES_KEY, post.get("individualPagePropertyname", "page")); + pdfParser.individualPages = sb.getConfigBool(SwitchboardConstants.PARSER_PDF_INDIVIDUALPAGES, false); + pdfParser.individualPagePropertyname = sb.getConfig(SwitchboardConstants.PARSER_PDF_INDIVIDUALPAGES_KEY, "page"); + } } int i = 0; @@ -89,6 +97,9 @@ public class ConfigParser { prop.put("parser", i); + prop.put("individualPages", sb.getConfigBool(SwitchboardConstants.PARSER_PDF_INDIVIDUALPAGES, false)); + prop.put("individualPagePropertyname", sb.getConfig(SwitchboardConstants.PARSER_PDF_INDIVIDUALPAGES_KEY, "page")); + // return rewrite properties return prop; } diff --git a/htroot/yacy/hello.java b/htroot/yacy/hello.java index 9d4d0d407..2e3906490 100644 --- a/htroot/yacy/hello.java +++ b/htroot/yacy/hello.java @@ -36,7 +36,6 @@ import java.util.concurrent.ConcurrentMap; import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; -import net.yacy.cora.util.ConcurrentLog; import net.yacy.peers.Network; import net.yacy.peers.DHTSelection; import net.yacy.peers.Protocol; @@ -59,7 +58,7 @@ public final class hello { final long start = System.currentTimeMillis(); prop.put("message", "none"); final String clientip = header.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, ""); // read an artificial header addendum - ConcurrentLog.info("**hello-DEBUG**", "client request from = " + clientip); + //ConcurrentLog.info("**hello-DEBUG**", "client request from = " + clientip); final InetAddress ias = Domains.dnsResolve(clientip); long time = System.currentTimeMillis(); final long time_dnsResolve = System.currentTimeMillis() - time; @@ -152,21 +151,21 @@ public final class hello { reportedips.add(ias.getHostAddress()); } final int connectedBefore = sb.peers.sizeConnected(); - ConcurrentLog.info("**hello-DEBUG**", "peer " + remoteSeed.getName() + " challenged us with IPs " + reportedips); + //ConcurrentLog.info("**hello-DEBUG**", "peer " + remoteSeed.getName() + " challenged us with IPs " + reportedips); int callbackRemain = Math.min(5, reportedips.size()); long callbackStart = System.currentTimeMillis(); if (callbackRemain > 0 && reportedips.size() > 0) { for (String reportedip: reportedips) { int partialtimeout = ((int) (callbackStart + 6500 - System.currentTimeMillis())) / callbackRemain; // bad hack until a concurrent version is implemented if (partialtimeout <= 0) break; - ConcurrentLog.info("**hello-DEBUG**", "reportedip = " + reportedip + " is handled"); + //ConcurrentLog.info("**hello-DEBUG**", "reportedip = " + reportedip + " is handled"); if (Seed.isProperIP(reportedip)) { - ConcurrentLog.info("**hello-DEBUG**", "starting callback to reportedip = " + reportedip + ", timeout = " + partialtimeout); + //ConcurrentLog.info("**hello-DEBUG**", "starting callback to reportedip = " + reportedip + ", timeout = " + partialtimeout); prop.put("yourip", reportedip); remoteSeed.setIP(reportedip); time = System.currentTimeMillis(); callback = Protocol.queryRWICount(remoteSeed.getPublicAddress(reportedip), remoteSeed.hash, partialtimeout); - ConcurrentLog.info("**hello-DEBUG**", "reportedip = " + reportedip + " returns callback " + (callback == null ? "NULL" : callback[0])); + //ConcurrentLog.info("**hello-DEBUG**", "reportedip = " + reportedip + " returns callback " + (callback == null ? "NULL" : callback[0])); time_backping = System.currentTimeMillis() - time; backping_method = "reportedip=" + reportedip; if (callback[0] >= 0) { success = true; break; } @@ -175,7 +174,7 @@ public final class hello { } } if (success) { - ConcurrentLog.info("**hello-DEBUG**", "success for IP(s) " + remoteSeed.getIPs() + ", port " + remoteSeed.getPort()); + //ConcurrentLog.info("**hello-DEBUG**", "success for IP(s) " + remoteSeed.getIPs() + ", port " + remoteSeed.getPort()); if (remoteSeed.get(Seed.PEERTYPE, Seed.PEERTYPE_SENIOR) == null) { prop.put(Seed.YOURTYPE, Seed.PEERTYPE_SENIOR); remoteSeed.put(Seed.PEERTYPE, Seed.PEERTYPE_SENIOR); @@ -189,7 +188,7 @@ public final class hello { Network.log.info("hello/server: responded remote " + reportedPeerType + " peer '" + remoteSeed.getName() + "' from " + reportedips + ", time_dnsResolve=" + time_dnsResolve + ", time_backping=" + time_backping + ", method=" + backping_method + ", urls=" + callback[0]); sb.peers.peerActions.peerArrival(remoteSeed, true); } else { - ConcurrentLog.info("**hello-DEBUG**", "fail for IP(s) " + remoteSeed.getIPs() + ", port " + remoteSeed.getPort()); + //ConcurrentLog.info("**hello-DEBUG**", "fail for IP(s) " + remoteSeed.getIPs() + ", port " + remoteSeed.getPort()); prop.put("yourip", ias.getHostAddress()); remoteSeed.setIP(ias.getHostAddress()); prop.put(Seed.YOURTYPE, Seed.PEERTYPE_JUNIOR);