From 71c416f383368836584de67c65785a0ab3a5eec8 Mon Sep 17 00:00:00 2001 From: reger Date: Fri, 18 Dec 2015 01:11:55 +0100 Subject: [PATCH] show mailto links in ViewFile.html linklist --- htroot/ViewFile.java | 19 +++++++++++++++++++ .../net/yacy/cora/document/id/AnchorURL.java | 4 ++-- .../cora/document/id/MultiProtocolURL.java | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/htroot/ViewFile.java b/htroot/ViewFile.java index 3f231b2ae..237ad8d86 100644 --- a/htroot/ViewFile.java +++ b/htroot/ViewFile.java @@ -34,6 +34,7 @@ import java.util.Collection; import java.util.Date; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import net.yacy.cora.document.encoding.ASCII; import net.yacy.cora.document.encoding.UTF8; @@ -325,6 +326,24 @@ public class ViewFile { prop.put("viewMode", VIEW_MODE_AS_LINKLIST); boolean dark = true; int i = 0; + + if (document.getEmaillinks() != null) { + Iterator> emailit = document.getEmaillinks().entrySet().iterator(); + while (emailit.hasNext()) { + Entry eentry = emailit.next(); + prop.put("viewMode_links_" + i + "_nr", i); + prop.put("viewMode_links_" + i + "_dark", dark ? "1" : "0"); + prop.put("viewMode_links_" + i + "_type", "email"); + prop.put("viewMode_links_" + i + "_text", (eentry.getValue().isEmpty()) ? " " : eentry.getValue()); + prop.put("viewMode_links_" + i + "_url", "#"); + prop.put("viewMode_links_" + i + "_link", eentry.getKey()); + prop.put("viewMode_links_" + i + "_rel", ""); + prop.put("viewMode_links_" + i + "_name", ""); + dark = !dark; + i++; + } + } + i += putMediaInfo(prop, wordArray, i, document.getVideolinks(), "video", (i % 2 == 0)); i += putMediaInfo(prop, wordArray, i, document.getAudiolinks(), "audio", (i % 2 == 0)); dark = (i % 2 == 0); diff --git a/source/net/yacy/cora/document/id/AnchorURL.java b/source/net/yacy/cora/document/id/AnchorURL.java index 50da8269c..c39a37fe8 100644 --- a/source/net/yacy/cora/document/id/AnchorURL.java +++ b/source/net/yacy/cora/document/id/AnchorURL.java @@ -102,8 +102,8 @@ public class AnchorURL extends DigestURL { isHTTPS(relPath) || isFTP(relPath) || isFile(relPath) || - isSMB(relPath)/*|| - relPath.contains(":") && patternMail.matcher(relPath.toLowerCase()).find()*/) { + isSMB(relPath) || + relPath.startsWith("mailto:")) { return new AnchorURL(relPath); } return new AnchorURL(baseURL, relPath); diff --git a/source/net/yacy/cora/document/id/MultiProtocolURL.java b/source/net/yacy/cora/document/id/MultiProtocolURL.java index b39cca1b4..42a068781 100644 --- a/source/net/yacy/cora/document/id/MultiProtocolURL.java +++ b/source/net/yacy/cora/document/id/MultiProtocolURL.java @@ -258,7 +258,7 @@ public class MultiProtocolURL implements Serializable, Comparable