diff --git a/htroot/Bookmarks_p.html b/htroot/Bookmarks_p.html index 5cf66b5c7..7d0fcba1b 100644 --- a/htroot/Bookmarks_p.html +++ b/htroot/Bookmarks_p.html @@ -9,37 +9,66 @@ #%env/templates/header.template%#

-

Bookmarks

+

Bookmarks

- - - - + #(/complete)# #{list}# @@ -97,6 +98,7 @@ + #(/complete)# #{/list}# diff --git a/htroot/env/style.css b/htroot/env/style.css index bcc4fb0ce..7e484161b 100644 --- a/htroot/env/style.css +++ b/htroot/env/style.css @@ -173,5 +173,22 @@ background-color: #eeeeee; background-color: #eeeeee; } .bookmarkTags{ -color: blue; +color: #007050; +font-weight:bold; +text-decoration:none; +white-space:nowrap; +} +.bookmarkTitle{ +line-height: 120%; +color: #4070a0; +font-size:17px; +font-weight:bold; +text-decoration:none; +} +.bookmarkDescription{ +font-style:normal; +} +.bookmarkAction{ +color: #999999; +text-decoration:none; } diff --git a/htroot/yacy/crawlReceipt.java b/htroot/yacy/crawlReceipt.java index c2689445e..1d117b7ad 100644 --- a/htroot/yacy/crawlReceipt.java +++ b/htroot/yacy/crawlReceipt.java @@ -59,6 +59,7 @@ import de.anomic.server.logging.serverLog; import de.anomic.tools.bitfield; import de.anomic.tools.crypt; import de.anomic.yacy.yacyCore; +import de.anomic.yacy.yacySeed; public final class crawlReceipt { @@ -110,6 +111,10 @@ public final class crawlReceipt { */ + final yacySeed otherPeer = yacyCore.seedDB.get(iam); + final String otherPeerName = iam + ":" + ((otherPeer == null) ? "NULL" : (otherPeer.getName() + "/" + otherPeer.getVersion())); + + if ((yacyCore.seedDB.mySeed == null) || (!(yacyCore.seedDB.mySeed.hash.equals(youare)))) { // no yacy connection / unknown peers prop.put("delay", "3600"); @@ -134,7 +139,7 @@ public final class crawlReceipt { switchboard.urlPool.noticeURL.remove(newUrlHash); switchboard.urlPool.noticeURL.remove(oldUrlHash); - log.logInfo("crawlReceipt: RECEIVED RECEIPT for URL " + receivedUrlhash + ":" + entry.url()); + log.logInfo("crawlReceipt: RECEIVED RECEIPT from " + otherPeerName + " for URL " + receivedUrlhash + ":" + entry.url()); } // ready for more diff --git a/yacy.logging b/yacy.logging index 8b4c78f78..fd1d10d2f 100644 --- a/yacy.logging +++ b/yacy.logging @@ -18,6 +18,9 @@ PLASMA.level = INFO SERVER.level = INFO WORDMIGRATION.level = FINE FILEHANDLER.level = INFO +SESSION-POOL.level = INFO +CRAWLER-POOL.level = INFO +STACKCRAWL-POOL.level = INFO # List of global handlers handlers = java.util.logging.FileHandler,\
-#(edit)#

Add Bookmark

::

Edit Bookmark

#(/edit)# +
-Url:
-Title:
-Description:
-Tags (comma separated):
-Public: -#(edit)# - -:: - -#(/edit)# + + + + + + + + + + + + + + + + + + + + + + + + + + +
#(edit)#

Add Bookmark

::

Edit Bookmark

#(/edit)#
Url:
Title:
Description:
Tags (comma separated):
Public: +
+ #(edit)# + + :: + + #(/edit)# +
-
+
+ + + + + + + +

Bookmark List

Tags

#{bookmarks}# +

#(public)#private::public#(/public)# -#[title]#
-#[description]#
-Tagged with #{tags}##[tag]# #{/tags}#
-Edit / -Delete -

+#[title]#
+#[description]#
+Tagged with | #{tags}##[tag]# | #{/tags}#
+Edit / +Delete +

#{/bookmarks}#

#(next-page)# @@ -47,13 +76,11 @@ Tagged with #{tags}# -All
+

 +All
#{taglist}# -#[name]#
+#[name]#
#{/taglist}# - - 
diff --git a/htroot/Network.html b/htroot/Network.html index 13e7d41f9..4cd7c182f 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -61,6 +61,7 @@ 		#Seeds
 		 con/h

 		 user agent

 		Peer
Ping
 
#[seeds]# #[connects]# #[userAgent]#[Ping]